diff --git a/Java.Interop.sln b/Java.Interop.sln
index 5746e1e48..b4366ee6d 100644
--- a/Java.Interop.sln
+++ b/Java.Interop.sln
@@ -105,6 +105,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaType
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Base", "src\Java.Base\Java.Base.csproj", "{30DCECA5-16FD-4FD0-883C-E5E83B11565D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Base-Tests", "tests\Java.Base-Tests\Java.Base-Tests.csproj", "{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 5
@@ -296,6 +298,10 @@ Global
 		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -346,6 +352,7 @@ Global
 		{B173F53B-986C-4E0D-881C-063BBB116E1D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
 		{11942DE9-AEC2-4B95-87AB-CA707C37643D} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
 		{30DCECA5-16FD-4FD0-883C-E5E83B11565D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
+		{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5}
diff --git a/Makefile b/Makefile
index b0b80bb09..644d11b67 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,9 @@ TESTS = \
 	bin/Test$(CONFIGURATION)/Java.Interop.Tools.Generator-Tests.dll \
 	bin/Test$(CONFIGURATION)/Xamarin.SourceWriter-Tests.dll
 
+NET_TESTS = \
+	bin/Test$(CONFIGURATION)-net6.0/Java.Base-Tests.dll
+
 PTESTS = \
 	bin/Test$(CONFIGURATION)/Java.Interop-PerformanceTests.dll
 
@@ -44,6 +47,7 @@ run-all-tests:
 	r=0; \
 	$(MAKE) run-tests                 || r=1 ; \
 	$(MAKE) run-test-jnimarshal       || r=1 ; \
+	$(MAKE) run-net-tests             || r=1 ; \
 	$(MAKE) run-ptests                || r=1 ; \
 	$(MAKE) run-java-source-utils-tests     || r=1 ; \
 	exit $$r;
@@ -123,6 +127,11 @@ run-tests: $(TESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
 	$(foreach t,$(TESTS), $(call RUN_TEST,$(t),1)) \
 	exit $$r;
 
+run-net-tests: $(NET_TESTS) bin/Test$(CONFIGURATION)-net6.0/$(JAVA_INTEROP_LIB)
+	r=0; \
+	$(foreach t,$(NET_TESTS), dotnet test $(t) || r=1) \
+	exit $$r;
+
 run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
 	r=0; \
 	$(foreach t,$(PTESTS), $(call RUN_TEST,$(t))) \
diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml
index 7532a8f68..3063a11c4 100644
--- a/build-tools/automation/templates/core-tests.yaml
+++ b/build-tools/automation/templates/core-tests.yaml
@@ -130,6 +130,15 @@ steps:
     arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Interop-PerformanceTests.dll
   continueOnError: true
 
+- task: DotNetCoreCLI@2
+  displayName: 'Tests: Java.Base'
+  condition: or(eq('${{ parameters.runNativeDotnetTests }}', 'true'), eq('${{ parameters.runNativeTests }}', 'true'))
+  inputs:
+    command: test
+    testRunTitle: Java.Base (net6.0 - ${{ parameters.platformName }})
+    arguments: bin/Test$(Build.Configuration)$(NetCoreTargetFrameworkPathSuffix)/Java.Base-Tests.dll
+  continueOnError: true
+
 - task: DotNetCoreCLI@2
   displayName: 'Tests: java-source-utils'
   inputs:
diff --git a/src/Java.Base-ref.cs b/src/Java.Base-ref.cs
index cabc1e0e5..d9c46e290 100644
--- a/src/Java.Base-ref.cs
+++ b/src/Java.Base-ref.cs
@@ -45,8 +45,11 @@ public BufferedReader(Java.IO.Reader? @in, int sz) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? cbuf, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         public virtual string? ReadLine() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/BufferedWriter", GenerateJavaPeer=false)]
@@ -58,9 +61,13 @@ public BufferedWriter(Java.IO.Writer? @out, int sz) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("newLine", "()V")]
         public virtual void NewLine() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ByteArrayInputStream", GenerateJavaPeer=false)]
@@ -76,6 +83,7 @@ protected ByteArrayInputStream(ref Java.Interop.JniObjectReference reference, Ja
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int Mark { get { throw null; } set { } }
         protected int Pos { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ByteArrayOutputStream", GenerateJavaPeer=false)]
@@ -89,14 +97,22 @@ public ByteArrayOutputStream(int size) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("reset", "()V")]
         public virtual void Reset() { }
+        [Java.Interop.JniMethodSignatureAttribute("size", "()I")]
         public virtual int Size() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toByteArray", "()[B")]
         public virtual Java.Interop.JavaSByteArray? ToByteArray() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(I)Ljava/lang/String;")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual string? ToString(int hibyte) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(Ljava/lang/String;)Ljava/lang/String;")]
         public virtual string? ToString(string? charsetName) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public override void Write(int b) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBytes", "([B)V")]
         public virtual void WriteBytes(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeTo", "(Ljava/io/OutputStream;)V")]
         public virtual void WriteTo(Java.IO.OutputStream? @out) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/CharArrayReader", GenerateJavaPeer=false)]
@@ -112,7 +128,9 @@ protected CharArrayReader(ref Java.Interop.JniObjectReference reference, Java.In
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int MarkedPos { get { throw null; } set { } }
         protected int Pos { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? b, int off, int len) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/CharArrayWriter", GenerateJavaPeer=false)]
@@ -126,12 +144,19 @@ public CharArrayWriter(int initialSize) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("reset", "()V")]
         public virtual void Reset() { }
+        [Java.Interop.JniMethodSignatureAttribute("size", "()I")]
         public virtual int Size() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toCharArray", "()[C")]
         public virtual Java.Interop.JavaCharArray? ToCharArray() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? c, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeTo", "(Ljava/io/Writer;)V")]
         public virtual void WriteTo(Java.IO.Writer? @out) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/CharConversionException", GenerateJavaPeer=false)]
@@ -151,14 +176,23 @@ internal Console() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/Console;")]
         public Java.IO.Console? Format(string? fmt, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("printf", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/Console;")]
         public Java.IO.Console? Printf(string? format, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reader", "()Ljava/io/Reader;")]
         public Java.IO.Reader? Reader() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         public string? ReadLine() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;")]
         public string? ReadLine(string? fmt, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readPassword", "()[C")]
         public Java.Interop.JavaCharArray? ReadPassword() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readPassword", "(Ljava/lang/String;[Ljava/lang/Object;)[C")]
         public Java.Interop.JavaCharArray? ReadPassword(string? fmt, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("writer", "()Ljava/io/PrintWriter;")]
         public Java.IO.PrintWriter? Writer() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/DataInputStream", GenerateJavaPeer=false)]
@@ -169,24 +203,42 @@ public partial class DataInputStream : Java.IO.FilterInputStream, Java.Interop.I
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([B)I")]
         public sealed override int Read(Java.Interop.JavaSByteArray? b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([BII)I")]
         public sealed override int Read(Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readBoolean", "()Z")]
         public bool ReadBoolean() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readByte", "()B")]
         public sbyte ReadByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readChar", "()C")]
         public char ReadChar() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readDouble", "()D")]
         public double ReadDouble() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFloat", "()F")]
         public float ReadFloat() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([B)V")]
         public void ReadFully(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([BII)V")]
         public void ReadFully(Java.Interop.JavaSByteArray? b, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("readInt", "()I")]
         public int ReadInt() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         [System.ObsoleteAttribute("deprecated")]
         public string? ReadLine() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLong", "()J")]
         public long ReadLong() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readShort", "()S")]
         public short ReadShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedByte", "()I")]
         public int ReadUnsignedByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedShort", "()I")]
         public int ReadUnsignedShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUTF", "()Ljava/lang/String;")]
         public string? ReadUTF() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUTF", "(Ljava/io/DataInput;)Ljava/lang/String;")]
         public static string? ReadUTF(Java.IO.IDataInput? @in) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("skipBytes", "(I)I")]
         public int SkipBytes(int n) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/DataOutputStream", GenerateJavaPeer=false)]
@@ -198,17 +250,29 @@ public partial class DataOutputStream : Java.IO.FilterOutputStream, Java.Interop
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int Written { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("size", "()I")]
         public int Size() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("writeBoolean", "(Z)V")]
         public void WriteBoolean(bool v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeByte", "(I)V")]
         public void WriteByte(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBytes", "(Ljava/lang/String;)V")]
         public void WriteBytes(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChar", "(I)V")]
         public void WriteChar(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChars", "(Ljava/lang/String;)V")]
         public void WriteChars(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeDouble", "(D)V")]
         public void WriteDouble(double v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeFloat", "(F)V")]
         public void WriteFloat(float v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeInt", "(I)V")]
         public void WriteInt(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeLong", "(J)V")]
         public void WriteLong(long v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeShort", "(I)V")]
         public void WriteShort(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeUTF", "(Ljava/lang/String;)V")]
         public void WriteUTF(string? str) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/EOFException", GenerateJavaPeer=false)]
@@ -250,35 +314,64 @@ public File(string? parent, string? child) { }
         public static char SeparatorChar { get { throw null; } }
         public virtual long TotalSpace { get { throw null; } }
         public virtual long UsableSpace { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("canExecute", "()Z")]
         public virtual bool CanExecute() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("canRead", "()Z")]
         public virtual bool CanRead() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("canWrite", "()Z")]
         public virtual bool CanWrite() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/io/File;)I")]
         public virtual int CompareTo(Java.IO.File? pathname) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("createNewFile", "()Z")]
         public virtual bool CreateNewFile() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("createTempFile", "(Ljava/lang/String;Ljava/lang/String;)Ljava/io/File;")]
         public static Java.IO.File? CreateTempFile(string? prefix, string? suffix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("createTempFile", "(Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Ljava/io/File;")]
         public static Java.IO.File? CreateTempFile(string? prefix, string? suffix, Java.IO.File? directory) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("delete", "()Z")]
         public virtual bool Delete() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("deleteOnExit", "()V")]
         public virtual void DeleteOnExit() { }
+        [Java.Interop.JniMethodSignatureAttribute("exists", "()Z")]
         public virtual bool Exists() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastModified", "()J")]
         public virtual long LastModified() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()J")]
         public virtual long Length() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("list", "()[Ljava/lang/String;")]
         public virtual Java.Interop.JavaObjectArray<string>? List() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("list", "(Ljava/io/FilenameFilter;)[Ljava/lang/String;")]
         public virtual Java.Interop.JavaObjectArray<string>? List(Java.IO.IFilenameFilter? filter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("listFiles", "()[Ljava/io/File;")]
         public virtual Java.Interop.JavaObjectArray<Java.IO.File>? ListFiles() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("listFiles", "(Ljava/io/FileFilter;)[Ljava/io/File;")]
         public virtual Java.Interop.JavaObjectArray<Java.IO.File>? ListFiles(Java.IO.IFileFilter? filter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("listFiles", "(Ljava/io/FilenameFilter;)[Ljava/io/File;")]
         public virtual Java.Interop.JavaObjectArray<Java.IO.File>? ListFiles(Java.IO.IFilenameFilter? filter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("listRoots", "()[Ljava/io/File;")]
         public static Java.Interop.JavaObjectArray<Java.IO.File>? ListRoots() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("mkdir", "()Z")]
         public virtual bool Mkdir() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("mkdirs", "()Z")]
         public virtual bool Mkdirs() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("renameTo", "(Ljava/io/File;)Z")]
         public virtual bool RenameTo(Java.IO.File? dest) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setExecutable", "(Z)Z")]
         public virtual bool SetExecutable(bool executable) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setExecutable", "(ZZ)Z")]
         public virtual bool SetExecutable(bool executable, bool ownerOnly) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setLastModified", "(J)Z")]
         public virtual bool SetLastModified(long time) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setReadable", "(Z)Z")]
         public virtual bool SetReadable(bool readable) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setReadable", "(ZZ)Z")]
         public virtual bool SetReadable(bool readable, bool ownerOnly) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setReadOnly", "()Z")]
         public virtual bool SetReadOnly() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setWritable", "(Z)Z")]
         public virtual bool SetWritable(bool writable) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setWritable", "(ZZ)Z")]
         public virtual bool SetWritable(bool writable, bool ownerOnly) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FileDescriptor", GenerateJavaPeer=false)]
@@ -291,7 +384,9 @@ public FileDescriptor() { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.IO.FileDescriptor? Out { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("sync", "()V")]
         public void Sync() { }
+        [Java.Interop.JniMethodSignatureAttribute("valid", "()Z")]
         public bool Valid() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FileInputStream", GenerateJavaPeer=false)]
@@ -305,6 +400,7 @@ public FileInputStream(string? name) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FileNotFoundException", GenerateJavaPeer=false)]
@@ -330,6 +426,7 @@ public FileOutputStream(string? name, bool append) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public override void Write(int b) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FileReader", GenerateJavaPeer=false)]
@@ -365,6 +462,7 @@ protected FilterInputStream(Java.IO.InputStream? @in) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FilterOutputStream", GenerateJavaPeer=false)]
@@ -376,6 +474,7 @@ public FilterOutputStream(Java.IO.OutputStream? @out) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected Java.IO.OutputStream? Out { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public override void Write(int b) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FilterReader", GenerateJavaPeer=false)]
@@ -387,7 +486,9 @@ protected FilterReader(Java.IO.Reader? @in) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? cbuf, int off, int len) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FilterWriter", GenerateJavaPeer=false)]
@@ -399,71 +500,109 @@ protected FilterWriter(Java.IO.Writer? @out) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected Java.IO.Writer? Out { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/Closeable", GenerateJavaPeer=false)]
     public partial interface ICloseable : Java.Interop.IJavaPeerable, Java.Lang.IAutoCloseable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         new void Close();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/DataInput", GenerateJavaPeer=false)]
     public partial interface IDataInput : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("readBoolean", "()Z")]
         bool ReadBoolean();
+        [Java.Interop.JniMethodSignatureAttribute("readByte", "()B")]
         sbyte ReadByte();
+        [Java.Interop.JniMethodSignatureAttribute("readChar", "()C")]
         char ReadChar();
+        [Java.Interop.JniMethodSignatureAttribute("readDouble", "()D")]
         double ReadDouble();
+        [Java.Interop.JniMethodSignatureAttribute("readFloat", "()F")]
         float ReadFloat();
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([B)V")]
         void ReadFully(Java.Interop.JavaSByteArray? p0);
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([BII)V")]
         void ReadFully(Java.Interop.JavaSByteArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("readInt", "()I")]
         int ReadInt();
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         string? ReadLine();
+        [Java.Interop.JniMethodSignatureAttribute("readLong", "()J")]
         long ReadLong();
+        [Java.Interop.JniMethodSignatureAttribute("readShort", "()S")]
         short ReadShort();
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedByte", "()I")]
         int ReadUnsignedByte();
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedShort", "()I")]
         int ReadUnsignedShort();
+        [Java.Interop.JniMethodSignatureAttribute("readUTF", "()Ljava/lang/String;")]
         string? ReadUTF();
+        [Java.Interop.JniMethodSignatureAttribute("skipBytes", "(I)I")]
         int SkipBytes(int p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/DataOutput", GenerateJavaPeer=false)]
     public partial interface IDataOutput : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("write", "([B)V")]
         void Write(Java.Interop.JavaSByteArray? p0);
+        [Java.Interop.JniMethodSignatureAttribute("write", "([BII)V")]
         void Write(Java.Interop.JavaSByteArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         void Write(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeBoolean", "(Z)V")]
         void WriteBoolean(bool p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeByte", "(I)V")]
         void WriteByte(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeBytes", "(Ljava/lang/String;)V")]
         void WriteBytes(string? p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeChar", "(I)V")]
         void WriteChar(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeChars", "(Ljava/lang/String;)V")]
         void WriteChars(string? p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeDouble", "(D)V")]
         void WriteDouble(double p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeFloat", "(F)V")]
         void WriteFloat(float p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeInt", "(I)V")]
         void WriteInt(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeLong", "(J)V")]
         void WriteLong(long p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeShort", "(I)V")]
         void WriteShort(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeUTF", "(Ljava/lang/String;)V")]
         void WriteUTF(string? p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/Externalizable", GenerateJavaPeer=false)]
     public partial interface IExternalizable : Java.Interop.IJavaPeerable, Java.IO.ISerializable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("readExternal", "(Ljava/io/ObjectInput;)V")]
         void ReadExternal(Java.IO.IObjectInput? p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeExternal", "(Ljava/io/ObjectOutput;)V")]
         void WriteExternal(Java.IO.IObjectOutput? p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FileFilter", GenerateJavaPeer=false)]
     public partial interface IFileFilter : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("accept", "(Ljava/io/File;)Z")]
         bool Accept(Java.IO.File? p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/FilenameFilter", GenerateJavaPeer=false)]
     public partial interface IFilenameFilter : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("accept", "(Ljava/io/File;Ljava/lang/String;)Z")]
         bool Accept(Java.IO.File? p0, string? p1);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/Flushable", GenerateJavaPeer=false)]
     public partial interface IFlushable : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         void Flush();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/InputStream", GenerateJavaPeer=false)]
@@ -474,19 +613,32 @@ protected InputStream(ref Java.Interop.JniObjectReference reference, Java.Intero
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("available", "()I")]
         public virtual int Available() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public virtual void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("mark", "(I)V")]
         public virtual void Mark(int readlimit) { }
+        [Java.Interop.JniMethodSignatureAttribute("markSupported", "()Z")]
         public virtual bool MarkSupported() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nullInputStream", "()Ljava/io/InputStream;")]
         public static Java.IO.InputStream? NullInputStream() { throw null; }
         public abstract int Read();
+        [Java.Interop.JniMethodSignatureAttribute("read", "([B)I")]
         public virtual int Read(Java.Interop.JavaSByteArray? b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([BII)I")]
         public virtual int Read(Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readAllBytes", "()[B")]
         public virtual Java.Interop.JavaSByteArray? ReadAllBytes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readNBytes", "([BII)I")]
         public virtual int ReadNBytes(Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readNBytes", "(I)[B")]
         public virtual Java.Interop.JavaSByteArray? ReadNBytes(int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reset", "()V")]
         public virtual void Reset() { }
+        [Java.Interop.JniMethodSignatureAttribute("skip", "(J)J")]
         public virtual long Skip(long n) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("transferTo", "(Ljava/io/OutputStream;)J")]
         public virtual long TransferTo(Java.IO.OutputStream? @out) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/InputStreamReader", GenerateJavaPeer=false)]
@@ -499,7 +651,9 @@ public InputStreamReader(Java.IO.InputStream? @in, string? charsetName) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? cbuf, int offset, int length) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/InterruptedIOException", GenerateJavaPeer=false)]
@@ -536,17 +690,25 @@ public InvalidObjectException(string? reason) { }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInput", GenerateJavaPeer=false)]
     public partial interface IObjectInput : Java.Interop.IJavaPeerable, Java.IO.IDataInput, Java.Lang.IAutoCloseable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("available", "()I")]
         int Available();
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         new void Close();
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         int Read();
+        [Java.Interop.JniMethodSignatureAttribute("read", "([B)I")]
         int Read(Java.Interop.JavaSByteArray? p0);
+        [Java.Interop.JniMethodSignatureAttribute("read", "([BII)I")]
         int Read(Java.Interop.JavaSByteArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("readObject", "()Ljava/lang/Object;")]
         Java.Lang.Object? ReadObject();
+        [Java.Interop.JniMethodSignatureAttribute("skip", "(J)J")]
         long Skip(long p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputFilter", GenerateJavaPeer=false)]
     public partial interface IObjectInputFilter : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("checkInput", "(Ljava/io/ObjectInputFilter$FilterInfo;)Ljava/io/ObjectInputFilter$Status;")]
         Java.IO.IObjectInputFilter.Status? CheckInput(Java.IO.IObjectInputFilter.IFilterInfo? p0);
         [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputFilter$Config", GenerateJavaPeer=false)]
         public sealed partial class Config : Java.Lang.Object
@@ -556,6 +718,7 @@ internal Config() { }
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
             public static Java.IO.IObjectInputFilter? SerialFilter { get { throw null; } set { } }
+            [Java.Interop.JniMethodSignatureAttribute("createFilter", "(Ljava/lang/String;)Ljava/io/ObjectInputFilter;")]
             public static Java.IO.IObjectInputFilter? CreateFilter(string? pattern) { throw null; }
             [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputFilter$Config$Global", GenerateJavaPeer=false)]
             public sealed partial class Global : Java.Lang.Object, Java.Interop.IJavaPeerable, Java.IO.IObjectInputFilter, System.IDisposable
@@ -564,16 +727,22 @@ internal Global() { }
                 [System.ComponentModel.EditorBrowsableAttribute(1)]
                 [System.Diagnostics.DebuggerBrowsableAttribute(0)]
                 public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+                [Java.Interop.JniMethodSignatureAttribute("checkInput", "(Ljava/io/ObjectInputFilter$FilterInfo;)Ljava/io/ObjectInputFilter$Status;")]
                 public Java.IO.IObjectInputFilter.Status? CheckInput(Java.IO.IObjectInputFilter.IFilterInfo? filterInfo) { throw null; }
             }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputFilter$FilterInfo", GenerateJavaPeer=false)]
         public partial interface IFilterInfo : Java.Interop.IJavaPeerable, System.IDisposable
         {
+            [Java.Interop.JniMethodSignatureAttribute("arrayLength", "()J")]
             long ArrayLength();
+            [Java.Interop.JniMethodSignatureAttribute("depth", "()J")]
             long Depth();
+            [Java.Interop.JniMethodSignatureAttribute("references", "()J")]
             long References();
+            [Java.Interop.JniMethodSignatureAttribute("serialClass", "()Ljava/lang/Class;")]
             Java.Lang.Class? SerialClass();
+            [Java.Interop.JniMethodSignatureAttribute("streamBytes", "()J")]
             long StreamBytes();
         }
         [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputFilter$Status", GenerateJavaPeer=false)]
@@ -586,23 +755,32 @@ public sealed partial class Status : Java.Lang.Enum
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
             public static Java.IO.IObjectInputFilter.Status? Rejected { get { throw null; } }
             public static Java.IO.IObjectInputFilter.Status? Undecided { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/io/ObjectInputFilter$Status;")]
             public static Java.IO.IObjectInputFilter.Status? ValueOf(string? name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/io/ObjectInputFilter$Status;")]
             public static Java.Interop.JavaObjectArray<Java.IO.IObjectInputFilter.Status>? Values() { throw null; }
         }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputValidation", GenerateJavaPeer=false)]
     public partial interface IObjectInputValidation : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("validateObject", "()V")]
         void ValidateObject();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectOutput", GenerateJavaPeer=false)]
     public partial interface IObjectOutput : Java.Interop.IJavaPeerable, Java.IO.IDataOutput, Java.Lang.IAutoCloseable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         new void Close();
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         void Flush();
+        [Java.Interop.JniMethodSignatureAttribute("write", "([B)V")]
         new void Write(Java.Interop.JavaSByteArray? p0);
+        [Java.Interop.JniMethodSignatureAttribute("write", "([BII)V")]
         new void Write(Java.Interop.JavaSByteArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         new void Write(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("writeObject", "(Ljava/lang/Object;)V")]
         void WriteObject(Java.Lang.Object? p0);
     }
     public partial interface IObjectStreamConstants
@@ -712,34 +890,62 @@ public ObjectInputStream(Java.IO.InputStream? @in) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public Java.IO.IObjectInputFilter? ObjectInputFilter { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("defaultReadObject", "()V")]
         public virtual void DefaultReadObject() { }
+        [Java.Interop.JniMethodSignatureAttribute("enableResolveObject", "(Z)Z")]
         protected virtual bool EnableResolveObject(bool enable) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readBoolean", "()Z")]
         public virtual bool ReadBoolean() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readByte", "()B")]
         public virtual sbyte ReadByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readChar", "()C")]
         public virtual char ReadChar() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readClassDescriptor", "()Ljava/io/ObjectStreamClass;")]
         protected virtual Java.IO.ObjectStreamClass? ReadClassDescriptor() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readDouble", "()D")]
         public virtual double ReadDouble() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFields", "()Ljava/io/ObjectInputStream$GetField;")]
         public virtual Java.IO.ObjectInputStream.GetField? ReadFields() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFloat", "()F")]
         public virtual float ReadFloat() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([B)V")]
         public virtual void ReadFully(Java.Interop.JavaSByteArray? buf) { }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([BII)V")]
         public virtual void ReadFully(Java.Interop.JavaSByteArray? buf, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("readInt", "()I")]
         public virtual int ReadInt() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual string? ReadLine() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLong", "()J")]
         public virtual long ReadLong() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readObject", "()Ljava/lang/Object;")]
         public Java.Lang.Object? ReadObject() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readObjectOverride", "()Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? ReadObjectOverride() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readShort", "()S")]
         public virtual short ReadShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readStreamHeader", "()V")]
         protected virtual void ReadStreamHeader() { }
+        [Java.Interop.JniMethodSignatureAttribute("readUnshared", "()Ljava/lang/Object;")]
         public virtual Java.Lang.Object? ReadUnshared() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedByte", "()I")]
         public virtual int ReadUnsignedByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedShort", "()I")]
         public virtual int ReadUnsignedShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUTF", "()Ljava/lang/String;")]
         public virtual string? ReadUTF() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("registerValidation", "(Ljava/io/ObjectInputValidation;I)V")]
         public virtual void RegisterValidation(Java.IO.IObjectInputValidation? obj, int prio) { }
+        [Java.Interop.JniMethodSignatureAttribute("resolveClass", "(Ljava/io/ObjectStreamClass;)Ljava/lang/Class;")]
         protected virtual Java.Lang.Class? ResolveClass(Java.IO.ObjectStreamClass? desc) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("resolveObject", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? ResolveObject(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("resolveProxyClass", "([Ljava/lang/String;)Ljava/lang/Class;")]
         protected virtual Java.Lang.Class? ResolveProxyClass(Java.Interop.JavaObjectArray<string>? interfaces) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("skipBytes", "(I)I")]
         public virtual int SkipBytes(int len) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectInputStream$GetField", GenerateJavaPeer=false)]
         public abstract partial class GetField : Java.Lang.Object
@@ -749,7 +955,7 @@ protected GetField(ref Java.Interop.JniObjectReference reference, Java.Interop.J
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
-            public abstract Java.IO.ObjectStreamClass? ObjectStreamClass { get; }
+            public abstract Java.IO.ObjectStreamClass? ObjectStreamClass { [Java.Interop.JniMethodSignatureAttribute("getObjectStreamClass", "()Ljava/io/ObjectStreamClass;")] get; }
             public abstract bool Defaulted(string? p0);
             public abstract Java.Lang.Object? Get(string? p0, Java.Lang.Object? p1);
             public abstract bool Get(string? p0, bool p1);
@@ -801,31 +1007,57 @@ public ObjectOutputStream(Java.IO.OutputStream? @out) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("annotateClass", "(Ljava/lang/Class;)V")]
         protected virtual void AnnotateClass(Java.Lang.Class? cl) { }
+        [Java.Interop.JniMethodSignatureAttribute("annotateProxyClass", "(Ljava/lang/Class;)V")]
         protected virtual void AnnotateProxyClass(Java.Lang.Class? cl) { }
+        [Java.Interop.JniMethodSignatureAttribute("defaultWriteObject", "()V")]
         public virtual void DefaultWriteObject() { }
+        [Java.Interop.JniMethodSignatureAttribute("drain", "()V")]
         protected virtual void Drain() { }
+        [Java.Interop.JniMethodSignatureAttribute("enableReplaceObject", "(Z)Z")]
         protected virtual bool EnableReplaceObject(bool enable) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("putFields", "()Ljava/io/ObjectOutputStream$PutField;")]
         public virtual Java.IO.ObjectOutputStream.PutField? PutFields() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replaceObject", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? ReplaceObject(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reset", "()V")]
         public virtual void Reset() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public override void Write(int val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBoolean", "(Z)V")]
         public virtual void WriteBoolean(bool val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeByte", "(I)V")]
         public virtual void WriteByte(int val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBytes", "(Ljava/lang/String;)V")]
         public virtual void WriteBytes(string? str) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChar", "(I)V")]
         public virtual void WriteChar(int val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChars", "(Ljava/lang/String;)V")]
         public virtual void WriteChars(string? str) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeClassDescriptor", "(Ljava/io/ObjectStreamClass;)V")]
         protected virtual void WriteClassDescriptor(Java.IO.ObjectStreamClass? desc) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeDouble", "(D)V")]
         public virtual void WriteDouble(double val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeFields", "()V")]
         public virtual void WriteFields() { }
+        [Java.Interop.JniMethodSignatureAttribute("writeFloat", "(F)V")]
         public virtual void WriteFloat(float val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeInt", "(I)V")]
         public virtual void WriteInt(int val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeLong", "(J)V")]
         public virtual void WriteLong(long val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeObject", "(Ljava/lang/Object;)V")]
         public void WriteObject(Java.Lang.Object? obj) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeObjectOverride", "(Ljava/lang/Object;)V")]
         protected virtual void WriteObjectOverride(Java.Lang.Object? obj) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeShort", "(I)V")]
         public virtual void WriteShort(int val) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeStreamHeader", "()V")]
         protected virtual void WriteStreamHeader() { }
+        [Java.Interop.JniMethodSignatureAttribute("writeUnshared", "(Ljava/lang/Object;)V")]
         public virtual void WriteUnshared(Java.Lang.Object? obj) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeUTF", "(Ljava/lang/String;)V")]
         public virtual void WriteUTF(string? str) { }
         public static partial class InterfaceConsts
         {
@@ -888,10 +1120,15 @@ protected ObjectStreamClass(ref Java.Interop.JniObjectReference reference, Java.
         public virtual string? Name { get { throw null; } }
         public static Java.Interop.JavaObjectArray<Java.IO.ObjectStreamField>? NoFields { get { throw null; } }
         public virtual long SerialVersionUID { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("forClass", "()Ljava/lang/Class;")]
         public virtual Java.Lang.Class? ForClass() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getField", "(Ljava/lang/String;)Ljava/io/ObjectStreamField;")]
         public virtual Java.IO.ObjectStreamField? GetField(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getFields", "()[Ljava/io/ObjectStreamField;")]
         public virtual Java.Interop.JavaObjectArray<Java.IO.ObjectStreamField>? GetFields() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lookup", "(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;")]
         public static Java.IO.ObjectStreamClass? Lookup(Java.Lang.Class? cl) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lookupAny", "(Ljava/lang/Class;)Ljava/io/ObjectStreamClass;")]
         public static Java.IO.ObjectStreamClass? LookupAny(Java.Lang.Class? cl) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/ObjectStreamException", GenerateJavaPeer=false)]
@@ -920,8 +1157,10 @@ public ObjectStreamField(string? name, Java.Lang.Class? type, bool unshared) { }
         public virtual Java.Lang.Class? Type { get { throw null; } }
         public virtual char TypeCode { get { throw null; } }
         public virtual string? TypeString { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Object;)I")]
         public virtual int CompareTo(Java.Lang.Object? obj) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setOffset", "(I)V")]
         protected virtual void SetOffset(int offset) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/OptionalDataException", GenerateJavaPeer=false)]
@@ -942,10 +1181,15 @@ protected OutputStream(ref Java.Interop.JniObjectReference reference, Java.Inter
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public virtual void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public virtual void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("nullOutputStream", "()Ljava/io/OutputStream;")]
         public static Java.IO.OutputStream? NullOutputStream() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([B)V")]
         public virtual void Write(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([BII)V")]
         public virtual void Write(Java.Interop.JavaSByteArray? b, int off, int len) { }
         public abstract void Write(int p0);
     }
@@ -959,8 +1203,11 @@ public OutputStreamWriter(Java.IO.OutputStream? @out, string? charsetName) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PipedInputStream", GenerateJavaPeer=false)]
@@ -978,8 +1225,11 @@ public PipedInputStream(int pipeSize) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int Out { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("connect", "(Ljava/io/PipedOutputStream;)V")]
         public virtual void Connect(Java.IO.PipedOutputStream? src) { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("receive", "(I)V")]
         protected virtual void Receive(int b) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PipedOutputStream", GenerateJavaPeer=false)]
@@ -991,7 +1241,9 @@ public PipedOutputStream(Java.IO.PipedInputStream? snk) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("connect", "(Ljava/io/PipedInputStream;)V")]
         public virtual void Connect(Java.IO.PipedInputStream? snk) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public override void Write(int b) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PipedReader", GenerateJavaPeer=false)]
@@ -1005,8 +1257,11 @@ public PipedReader(int pipeSize) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("connect", "(Ljava/io/PipedWriter;)V")]
         public virtual void Connect(Java.IO.PipedWriter? src) { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? cbuf, int off, int len) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PipedWriter", GenerateJavaPeer=false)]
@@ -1018,9 +1273,13 @@ public PipedWriter(Java.IO.PipedReader? snk) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("connect", "(Ljava/io/PipedReader;)V")]
         public virtual void Connect(Java.IO.PipedReader? snk) { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PrintStream", GenerateJavaPeer=false)]
@@ -1037,37 +1296,64 @@ public partial class PrintStream : Java.IO.FilterOutputStream, Java.Interop.IJav
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;)Ljava/io/PrintStream;")]
         public virtual Java.IO.PrintStream? Append(Java.Lang.ICharSequence? csq) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;II)Ljava/io/PrintStream;")]
         public virtual Java.IO.PrintStream? Append(Java.Lang.ICharSequence? csq, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(C)Ljava/io/PrintStream;")]
         public virtual Java.IO.PrintStream? Append(char c) { throw null; }
         public Java.IO.PrintStream? Append(string? csq) { throw null; }
         public Java.IO.PrintStream? Append(string? csq, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("checkError", "()Z")]
         public virtual bool CheckError() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("clearError", "()V")]
         protected virtual void ClearError() { }
+        [Java.Interop.JniMethodSignatureAttribute("format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream;")]
         public virtual Java.IO.PrintStream? Format(string? format, params Java.Lang.Object[]? args) { throw null; }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(Java.Lang.ICharSequence? p0) { throw null; }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(Java.Lang.ICharSequence? p0, int p1, int p2) { throw null; }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(char p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("print", "([C)V")]
         public virtual void Print(Java.Interop.JavaCharArray? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Ljava/lang/Object;)V")]
         public virtual void Print(Java.Lang.Object? obj) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Z)V")]
         public virtual void Print(bool b) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(C)V")]
         public virtual void Print(char c) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(D)V")]
         public virtual void Print(double d) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(I)V")]
         public virtual void Print(int i) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(J)V")]
         public virtual void Print(long l) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(F)V")]
         public virtual void Print(float f) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Ljava/lang/String;)V")]
         public virtual void Print(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("printf", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintStream;")]
         public virtual Java.IO.PrintStream? Printf(string? format, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("println", "()V")]
         public virtual void Println() { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "([C)V")]
         public virtual void Println(Java.Interop.JavaCharArray? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Ljava/lang/Object;)V")]
         public virtual void Println(Java.Lang.Object? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Z)V")]
         public virtual void Println(bool x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(C)V")]
         public virtual void Println(char x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(D)V")]
         public virtual void Println(double x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(I)V")]
         public virtual void Println(int x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(J)V")]
         public virtual void Println(long x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(F)V")]
         public virtual void Println(float x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Ljava/lang/String;)V")]
         public virtual void Println(string? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("setError", "()V")]
         protected virtual void SetError() { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PrintWriter", GenerateJavaPeer=false)]
@@ -1086,32 +1372,59 @@ public PrintWriter(string? fileName, string? csn) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected Java.IO.Writer? Out { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("checkError", "()Z")]
         public virtual bool CheckError() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("clearError", "()V")]
         protected virtual void ClearError() { }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintWriter;")]
         public virtual Java.IO.PrintWriter? Format(string? format, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("print", "([C)V")]
         public virtual void Print(Java.Interop.JavaCharArray? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Ljava/lang/Object;)V")]
         public virtual void Print(Java.Lang.Object? obj) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Z)V")]
         public virtual void Print(bool b) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(C)V")]
         public virtual void Print(char c) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(D)V")]
         public virtual void Print(double d) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(I)V")]
         public virtual void Print(int i) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(J)V")]
         public virtual void Print(long l) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(F)V")]
         public virtual void Print(float f) { }
+        [Java.Interop.JniMethodSignatureAttribute("print", "(Ljava/lang/String;)V")]
         public virtual void Print(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("printf", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/io/PrintWriter;")]
         public virtual Java.IO.PrintWriter? Printf(string? format, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("println", "()V")]
         public virtual void Println() { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "([C)V")]
         public virtual void Println(Java.Interop.JavaCharArray? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Ljava/lang/Object;)V")]
         public virtual void Println(Java.Lang.Object? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Z)V")]
         public virtual void Println(bool x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(C)V")]
         public virtual void Println(char x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(D)V")]
         public virtual void Println(double x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(I)V")]
         public virtual void Println(int x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(J)V")]
         public virtual void Println(long x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(F)V")]
         public virtual void Println(float x) { }
+        [Java.Interop.JniMethodSignatureAttribute("println", "(Ljava/lang/String;)V")]
         public virtual void Println(string? x) { }
+        [Java.Interop.JniMethodSignatureAttribute("setError", "()V")]
         protected virtual void SetError() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? buf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PushbackInputStream", GenerateJavaPeer=false)]
@@ -1125,8 +1438,11 @@ public partial class PushbackInputStream : Java.IO.FilterInputStream
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int Pos { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "([B)V")]
         public virtual void Unread(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "([BII)V")]
         public virtual void Unread(Java.Interop.JavaSByteArray? b, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "(I)V")]
         public virtual void Unread(int b) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/PushbackReader", GenerateJavaPeer=false)]
@@ -1138,8 +1454,11 @@ public partial class PushbackReader : Java.IO.FilterReader
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "([C)V")]
         public virtual void Unread(Java.Interop.JavaCharArray? cbuf) { }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "([CII)V")]
         public virtual void Unread(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("unread", "(I)V")]
         public virtual void Unread(int c) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/RandomAccessFile", GenerateJavaPeer=false)]
@@ -1153,41 +1472,77 @@ public RandomAccessFile(string? name, string? mode) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public virtual void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()J")]
         public virtual long Length() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public virtual int Read() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([B)I")]
         public virtual int Read(Java.Interop.JavaSByteArray? b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([BII)I")]
         public virtual int Read(Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readBoolean", "()Z")]
         public bool ReadBoolean() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readByte", "()B")]
         public sbyte ReadByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readChar", "()C")]
         public char ReadChar() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readDouble", "()D")]
         public double ReadDouble() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFloat", "()F")]
         public float ReadFloat() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([B)V")]
         public void ReadFully(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("readFully", "([BII)V")]
         public void ReadFully(Java.Interop.JavaSByteArray? b, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("readInt", "()I")]
         public int ReadInt() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLine", "()Ljava/lang/String;")]
         public string? ReadLine() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readLong", "()J")]
         public long ReadLong() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readShort", "()S")]
         public short ReadShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedByte", "()I")]
         public int ReadUnsignedByte() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUnsignedShort", "()I")]
         public int ReadUnsignedShort() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("readUTF", "()Ljava/lang/String;")]
         public string? ReadUTF() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("seek", "(J)V")]
         public virtual void Seek(long pos) { }
+        [Java.Interop.JniMethodSignatureAttribute("setLength", "(J)V")]
         public virtual void SetLength(long p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("skipBytes", "(I)I")]
         public virtual int SkipBytes(int n) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([B)V")]
         public virtual void Write(Java.Interop.JavaSByteArray? b) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([BII)V")]
         public virtual void Write(Java.Interop.JavaSByteArray? b, int off, int len) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public virtual void Write(int b) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBoolean", "(Z)V")]
         public void WriteBoolean(bool v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeByte", "(I)V")]
         public void WriteByte(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeBytes", "(Ljava/lang/String;)V")]
         public void WriteBytes(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChar", "(I)V")]
         public void WriteChar(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeChars", "(Ljava/lang/String;)V")]
         public void WriteChars(string? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeDouble", "(D)V")]
         public void WriteDouble(double v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeFloat", "(F)V")]
         public void WriteFloat(float v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeInt", "(I)V")]
         public void WriteInt(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeLong", "(J)V")]
         public void WriteLong(long v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeShort", "(I)V")]
         public void WriteShort(int v) { }
+        [Java.Interop.JniMethodSignatureAttribute("writeUTF", "(Ljava/lang/String;)V")]
         public void WriteUTF(string? str) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/Reader", GenerateJavaPeer=false)]
@@ -1201,15 +1556,24 @@ protected Reader(Java.Lang.Object? @lock) { }
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected Java.Lang.Object? Lock { get { throw null; } set { } }
         public abstract void Close();
+        [Java.Interop.JniMethodSignatureAttribute("mark", "(I)V")]
         public virtual void Mark(int readAheadLimit) { }
+        [Java.Interop.JniMethodSignatureAttribute("markSupported", "()Z")]
         public virtual bool MarkSupported() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nullReader", "()Ljava/io/Reader;")]
         public static Java.IO.Reader? NullReader() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public virtual int Read() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([C)I")]
         public virtual int Read(Java.Interop.JavaCharArray? cbuf) { throw null; }
         public abstract int Read(Java.Interop.JavaCharArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("ready", "()Z")]
         public virtual bool Ready() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reset", "()V")]
         public virtual void Reset() { }
+        [Java.Interop.JniMethodSignatureAttribute("skip", "(J)J")]
         public virtual long Skip(long n) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("transferTo", "(Ljava/io/Writer;)J")]
         public virtual long TransferTo(Java.IO.Writer? @out) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/SequenceInputStream", GenerateJavaPeer=false)]
@@ -1220,6 +1584,7 @@ public SequenceInputStream(Java.IO.InputStream? s1, Java.IO.InputStream? s2) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/StreamCorruptedException", GenerateJavaPeer=false)]
@@ -1249,19 +1614,33 @@ public StreamTokenizer(Java.IO.Reader? r) { }
         public double Nval { get { throw null; } set { } }
         public string? Sval { get { throw null; } set { } }
         public int Ttype { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("commentChar", "(I)V")]
         public virtual void CommentChar(int ch) { }
+        [Java.Interop.JniMethodSignatureAttribute("eolIsSignificant", "(Z)V")]
         public virtual void EolIsSignificant(bool flag) { }
+        [Java.Interop.JniMethodSignatureAttribute("lineno", "()I")]
         public virtual int Lineno() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lowerCaseMode", "(Z)V")]
         public virtual void LowerCaseMode(bool fl) { }
+        [Java.Interop.JniMethodSignatureAttribute("ordinaryChar", "(I)V")]
         public virtual void OrdinaryChar(int ch) { }
+        [Java.Interop.JniMethodSignatureAttribute("ordinaryChars", "(II)V")]
         public virtual void OrdinaryChars(int low, int hi) { }
+        [Java.Interop.JniMethodSignatureAttribute("parseNumbers", "()V")]
         public virtual void ParseNumbers() { }
+        [Java.Interop.JniMethodSignatureAttribute("pushBack", "()V")]
         public virtual void PushBack() { }
+        [Java.Interop.JniMethodSignatureAttribute("quoteChar", "(I)V")]
         public virtual void QuoteChar(int ch) { }
+        [Java.Interop.JniMethodSignatureAttribute("resetSyntax", "()V")]
         public virtual void ResetSyntax() { }
+        [Java.Interop.JniMethodSignatureAttribute("slashSlashComments", "(Z)V")]
         public virtual void SlashSlashComments(bool flag) { }
+        [Java.Interop.JniMethodSignatureAttribute("slashStarComments", "(Z)V")]
         public virtual void SlashStarComments(bool flag) { }
+        [Java.Interop.JniMethodSignatureAttribute("whitespaceChars", "(II)V")]
         public virtual void WhitespaceChars(int low, int hi) { }
+        [Java.Interop.JniMethodSignatureAttribute("wordChars", "(II)V")]
         public virtual void WordChars(int low, int hi) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/StringBufferInputStream", GenerateJavaPeer=false)]
@@ -1276,6 +1655,7 @@ public StringBufferInputStream(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected int Pos { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("read", "()I")]
         public override int Read() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/StringReader", GenerateJavaPeer=false)]
@@ -1286,7 +1666,9 @@ public StringReader(string? s) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("read", "([CII)I")]
         public override int Read(Java.Interop.JavaCharArray? cbuf, int off, int len) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/StringWriter", GenerateJavaPeer=false)]
@@ -1299,8 +1681,11 @@ public StringWriter(int initialSize) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         public override void Close() { }
+        [Java.Interop.JniMethodSignatureAttribute("flush", "()V")]
         public override void Flush() { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([CII)V")]
         public override void Write(Java.Interop.JavaCharArray? cbuf, int off, int len) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/io/SyncFailedException", GenerateJavaPeer=false)]
@@ -1362,8 +1747,11 @@ protected Writer(Java.Lang.Object? @lock) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected Java.Lang.Object? Lock { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;)Ljava/io/Writer;")]
         public virtual Java.IO.Writer? Append(Java.Lang.ICharSequence? csq) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;II)Ljava/io/Writer;")]
         public virtual Java.IO.Writer? Append(Java.Lang.ICharSequence? csq, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(C)Ljava/io/Writer;")]
         public virtual Java.IO.Writer? Append(char c) { throw null; }
         public Java.IO.Writer? Append(string? csq) { throw null; }
         public Java.IO.Writer? Append(string? csq, int start, int end) { throw null; }
@@ -1372,11 +1760,16 @@ protected Writer(Java.Lang.Object? @lock) { }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(Java.Lang.ICharSequence? p0) { throw null; }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(Java.Lang.ICharSequence? p0, int p1, int p2) { throw null; }
         Java.Lang.IAppendable? Java.Lang.IAppendable.Append(char p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nullWriter", "()Ljava/io/Writer;")]
         public static Java.IO.Writer? NullWriter() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("write", "([C)V")]
         public virtual void Write(Java.Interop.JavaCharArray? cbuf) { }
         public abstract void Write(Java.Interop.JavaCharArray? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("write", "(I)V")]
         public virtual void Write(int c) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(Ljava/lang/String;)V")]
         public virtual void Write(string? str) { }
+        [Java.Interop.JniMethodSignatureAttribute("write", "(Ljava/lang/String;II)V")]
         public virtual void Write(string? str, int off, int len) { }
     }
 }
@@ -1453,18 +1846,30 @@ public Boolean(string? s) { }
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Boolean? True { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("booleanValue", "()Z")]
         public bool BooleanValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(ZZ)I")]
         public static int Compare(bool x, bool y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Boolean;)I")]
         public int CompareTo(Java.Lang.Boolean? b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getBoolean", "(Ljava/lang/String;)Z")]
         public static bool GetBoolean(string? name) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(Z)I")]
         public static int HashCode(bool value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("logicalAnd", "(ZZ)Z")]
         public static bool LogicalAnd(bool a, bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("logicalOr", "(ZZ)Z")]
         public static bool LogicalOr(bool a, bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("logicalXor", "(ZZ)Z")]
         public static bool LogicalXor(bool a, bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseBoolean", "(Ljava/lang/String;)Z")]
         public static bool ParseBoolean(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(Z)Ljava/lang/String;")]
         public static string? ToString(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Z)Ljava/lang/Boolean;")]
         public static Java.Lang.Boolean? ValueOf(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Boolean;")]
         public static Java.Lang.Boolean? ValueOf(string? s) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/BootstrapMethodError", GenerateJavaPeer=false)]
@@ -1494,23 +1899,40 @@ public Byte(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(BB)I")]
         public static int Compare(sbyte x, sbyte y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Byte;)I")]
         public int CompareTo(Java.Lang.Byte? anotherByte) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareUnsigned", "(BB)I")]
         public static int CompareUnsigned(sbyte x, sbyte y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decode", "(Ljava/lang/String;)Ljava/lang/Byte;")]
         public static Java.Lang.Byte? Decode(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(B)I")]
         public static int HashCode(sbyte value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseByte", "(Ljava/lang/String;)B")]
         public static sbyte ParseByte(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseByte", "(Ljava/lang/String;I)B")]
         public static sbyte ParseByte(string? s, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(B)Ljava/lang/String;")]
         public static string? ToString(sbyte b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedInt", "(B)I")]
         public static int ToUnsignedInt(sbyte x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedLong", "(B)J")]
         public static long ToUnsignedLong(sbyte x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(B)Ljava/lang/Byte;")]
         public static Java.Lang.Byte? ValueOf(sbyte b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Byte;")]
         public static Java.Lang.Byte? ValueOf(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;I)Ljava/lang/Byte;")]
         public static Java.Lang.Byte? ValueOf(string? s, int radix) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Character", GenerateJavaPeer=false)]
@@ -1591,98 +2013,183 @@ public Character(char value) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("charCount", "(I)I")]
         public static int CharCount(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("charValue", "()C")]
         public char CharValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "([CI)I")]
         public static int CodePointAt(Java.Interop.JavaCharArray? a, int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "([CII)I")]
         public static int CodePointAt(Java.Interop.JavaCharArray? a, int index, int limit) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "(Ljava/lang/CharSequence;I)I")]
         public static int CodePointAt(Java.Lang.ICharSequence? seq, int index) { throw null; }
         public static int CodePointAt(string? seq, int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "([CI)I")]
         public static int CodePointBefore(Java.Interop.JavaCharArray? a, int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "([CII)I")]
         public static int CodePointBefore(Java.Interop.JavaCharArray? a, int index, int start) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "(Ljava/lang/CharSequence;I)I")]
         public static int CodePointBefore(Java.Lang.ICharSequence? seq, int index) { throw null; }
         public static int CodePointBefore(string? seq, int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointCount", "([CII)I")]
         public static int CodePointCount(Java.Interop.JavaCharArray? a, int offset, int count) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointCount", "(Ljava/lang/CharSequence;II)I")]
         public static int CodePointCount(Java.Lang.ICharSequence? seq, int beginIndex, int endIndex) { throw null; }
         public static int CodePointCount(string? seq, int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointOf", "(Ljava/lang/String;)I")]
         public static int CodePointOf(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(CC)I")]
         public static int Compare(char x, char y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Character;)I")]
         public int CompareTo(Java.Lang.Character? anotherCharacter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("digit", "(CI)I")]
         public static int Digit(char ch, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("digit", "(II)I")]
         public static int Digit(int codePoint, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("forDigit", "(II)C")]
         public static char ForDigit(int digit, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDirectionality", "(C)B")]
         public static sbyte GetDirectionality(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDirectionality", "(I)B")]
         public static sbyte GetDirectionality(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getName", "(I)Ljava/lang/String;")]
         public static string? GetName(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getNumericValue", "(C)I")]
         public static int GetNumericValue(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getNumericValue", "(I)I")]
         public static int GetNumericValue(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getType", "(C)I")]
         public static int GetType(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getType", "(I)I")]
         public static int GetType(int codePoint) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(C)I")]
         public static int HashCode(char value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("highSurrogate", "(I)C")]
         public static char HighSurrogate(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAlphabetic", "(I)Z")]
         public static bool IsAlphabetic(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isBmpCodePoint", "(I)Z")]
         public static bool IsBmpCodePoint(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isDefined", "(C)Z")]
         public static bool IsDefined(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isDefined", "(I)Z")]
         public static bool IsDefined(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isDigit", "(C)Z")]
         public static bool IsDigit(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isDigit", "(I)Z")]
         public static bool IsDigit(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isHighSurrogate", "(C)Z")]
         public static bool IsHighSurrogate(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isIdentifierIgnorable", "(C)Z")]
         public static bool IsIdentifierIgnorable(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isIdentifierIgnorable", "(I)Z")]
         public static bool IsIdentifierIgnorable(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isIdeographic", "(I)Z")]
         public static bool IsIdeographic(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isISOControl", "(C)Z")]
         public static bool IsISOControl(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isISOControl", "(I)Z")]
         public static bool IsISOControl(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaIdentifierPart", "(C)Z")]
         public static bool IsJavaIdentifierPart(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaIdentifierPart", "(I)Z")]
         public static bool IsJavaIdentifierPart(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaIdentifierStart", "(C)Z")]
         public static bool IsJavaIdentifierStart(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaIdentifierStart", "(I)Z")]
         public static bool IsJavaIdentifierStart(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaLetter", "(C)Z")]
         [System.ObsoleteAttribute("deprecated")]
         public static bool IsJavaLetter(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isJavaLetterOrDigit", "(C)Z")]
         [System.ObsoleteAttribute("deprecated")]
         public static bool IsJavaLetterOrDigit(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLetter", "(C)Z")]
         public static bool IsLetter(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLetter", "(I)Z")]
         public static bool IsLetter(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLetterOrDigit", "(C)Z")]
         public static bool IsLetterOrDigit(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLetterOrDigit", "(I)Z")]
         public static bool IsLetterOrDigit(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLowerCase", "(C)Z")]
         public static bool IsLowerCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLowerCase", "(I)Z")]
         public static bool IsLowerCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isLowSurrogate", "(C)Z")]
         public static bool IsLowSurrogate(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isMirrored", "(C)Z")]
         public static bool IsMirrored(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isMirrored", "(I)Z")]
         public static bool IsMirrored(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSpace", "(C)Z")]
         [System.ObsoleteAttribute("deprecated")]
         public static bool IsSpace(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSpaceChar", "(C)Z")]
         public static bool IsSpaceChar(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSpaceChar", "(I)Z")]
         public static bool IsSpaceChar(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSupplementaryCodePoint", "(I)Z")]
         public static bool IsSupplementaryCodePoint(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSurrogate", "(C)Z")]
         public static bool IsSurrogate(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSurrogatePair", "(CC)Z")]
         public static bool IsSurrogatePair(char high, char low) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isTitleCase", "(C)Z")]
         public static bool IsTitleCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isTitleCase", "(I)Z")]
         public static bool IsTitleCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUnicodeIdentifierPart", "(C)Z")]
         public static bool IsUnicodeIdentifierPart(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUnicodeIdentifierPart", "(I)Z")]
         public static bool IsUnicodeIdentifierPart(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUnicodeIdentifierStart", "(C)Z")]
         public static bool IsUnicodeIdentifierStart(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUnicodeIdentifierStart", "(I)Z")]
         public static bool IsUnicodeIdentifierStart(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUpperCase", "(C)Z")]
         public static bool IsUpperCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isUpperCase", "(I)Z")]
         public static bool IsUpperCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isValidCodePoint", "(I)Z")]
         public static bool IsValidCodePoint(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isWhitespace", "(C)Z")]
         public static bool IsWhitespace(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isWhitespace", "(I)Z")]
         public static bool IsWhitespace(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lowSurrogate", "(I)C")]
         public static char LowSurrogate(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("offsetByCodePoints", "([CIIII)I")]
         public static int OffsetByCodePoints(Java.Interop.JavaCharArray? a, int start, int count, int index, int codePointOffset) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("offsetByCodePoints", "(Ljava/lang/CharSequence;II)I")]
         public static int OffsetByCodePoints(Java.Lang.ICharSequence? seq, int index, int codePointOffset) { throw null; }
         public static int OffsetByCodePoints(string? seq, int index, int codePointOffset) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverseBytes", "(C)C")]
         public static char ReverseBytes(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toChars", "(I)[C")]
         public static Java.Interop.JavaCharArray? ToChars(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toChars", "(I[CI)I")]
         public static int ToChars(int codePoint, Java.Interop.JavaCharArray? dst, int dstIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toCodePoint", "(CC)I")]
         public static int ToCodePoint(char high, char low) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toLowerCase", "(C)C")]
         public static char ToLowerCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toLowerCase", "(I)I")]
         public static int ToLowerCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(C)Ljava/lang/String;")]
         public static string? ToString(char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(I)Ljava/lang/String;")]
         public static string? ToString(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toTitleCase", "(C)C")]
         public static char ToTitleCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toTitleCase", "(I)I")]
         public static int ToTitleCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUpperCase", "(C)C")]
         public static char ToUpperCase(char ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUpperCase", "(I)I")]
         public static int ToUpperCase(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(C)Ljava/lang/Character;")]
         public static Java.Lang.Character? ValueOf(char c) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Character$Subset", GenerateJavaPeer=false)]
         public partial class Subset : Java.Lang.Object
@@ -1692,8 +2199,11 @@ protected Subset(string? name) { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("equals", "(Ljava/lang/Object;)Z")]
             public sealed override bool Equals(Java.Lang.Object? obj) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("hashCode", "()I")]
             public sealed override int GetHashCode() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
             public sealed override string? ToString() { throw null; }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Character$UnicodeBlock", GenerateJavaPeer=false)]
@@ -1985,8 +2495,11 @@ public sealed partial class UnicodeBlock : Java.Lang.Character.Subset
             public static Java.Lang.Character.UnicodeBlock YiRadicals { get { throw null; } }
             public static Java.Lang.Character.UnicodeBlock YiSyllables { get { throw null; } }
             public static Java.Lang.Character.UnicodeBlock ZanabazarSquare { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("forName", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeBlock;")]
             public static Java.Lang.Character.UnicodeBlock ForName(string blockName) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("of", "(C)Ljava/lang/Character$UnicodeBlock;")]
             public static Java.Lang.Character.UnicodeBlock Of(char c) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("of", "(I)Ljava/lang/Character$UnicodeBlock;")]
             public static Java.Lang.Character.UnicodeBlock Of(int codePoint) { throw null; }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Character$UnicodeScript", GenerateJavaPeer=false)]
@@ -2138,9 +2651,13 @@ public sealed partial class UnicodeScript : Java.Lang.Enum
             public static Java.Lang.Character.UnicodeScript WarangCiti { get { throw null; } }
             public static Java.Lang.Character.UnicodeScript Yi { get { throw null; } }
             public static Java.Lang.Character.UnicodeScript ZanabazarSquare { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("forName", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeScript;")]
             public static Java.Lang.Character.UnicodeScript ForName(string scriptName) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("of", "(I)Ljava/lang/Character$UnicodeScript;")]
             public static Java.Lang.Character.UnicodeScript Of(int codePoint) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Character$UnicodeScript;")]
             public static Java.Lang.Character.UnicodeScript ValueOf(string name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/Character$UnicodeScript;")]
             public static Java.Interop.JavaObjectArray<Java.Lang.Character.UnicodeScript>? Values() { throw null; }
         }
     }
@@ -2180,50 +2697,90 @@ internal Class() { }
         public Java.Lang.Class? Superclass { get { throw null; } }
         public string? TypeName { get { throw null; } }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "U"})]
+        [Java.Interop.JniMethodSignatureAttribute("asSubclass", "(Ljava/lang/Class;)Ljava/lang/Class;")]
         public Java.Lang.Class? AsSubclass(Java.Lang.Class? clazz) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cast", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? Cast(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("desiredAssertionStatus", "()Z")]
         public bool DesiredAssertionStatus() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("forName", "(Ljava/lang/Module;Ljava/lang/String;)Ljava/lang/Class;")]
         public static Java.Lang.Class? ForName(Java.Lang.Module? module, string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("forName", "(Ljava/lang/String;)Ljava/lang/Class;")]
         public static Java.Lang.Class? ForName(string? className) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("forName", "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;")]
         public static Java.Lang.Class? ForName(string? name, bool initialize, Java.Lang.ClassLoader? loader) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedInterfaces", "()[Ljava/lang/reflect/AnnotatedType;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedInterfaces() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public Java.Lang.Object? GetAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getClasses", "()[Ljava/lang/Class;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Class>? GetClasses() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;")]
         public Java.Lang.Reflect.Constructor? GetConstructor(params Java.Lang.Class[]? parameterTypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getConstructors", "()[Ljava/lang/reflect/Constructor;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Constructor>? GetConstructors() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public Java.Lang.Object? GetDeclaredAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetDeclaredAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredClasses", "()[Ljava/lang/Class;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Class>? GetDeclaredClasses() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;")]
         public Java.Lang.Reflect.Constructor? GetDeclaredConstructor(params Java.Lang.Class[]? parameterTypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredConstructors", "()[Ljava/lang/reflect/Constructor;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Constructor>? GetDeclaredConstructors() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;")]
         public Java.Lang.Reflect.Field? GetDeclaredField(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredFields", "()[Ljava/lang/reflect/Field;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Field>? GetDeclaredFields() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredMethod", "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;")]
         public Java.Lang.Reflect.Method? GetDeclaredMethod(string? name, params Java.Lang.Class[]? parameterTypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredMethods", "()[Ljava/lang/reflect/Method;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Method>? GetDeclaredMethods() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getEnumConstants", "()[Ljava/lang/Object;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetEnumConstants() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getField", "(Ljava/lang/String;)Ljava/lang/reflect/Field;")]
         public Java.Lang.Reflect.Field? GetField(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getFields", "()[Ljava/lang/reflect/Field;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Field>? GetFields() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getGenericInterfaces", "()[Ljava/lang/reflect/Type;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetGenericInterfaces() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInterfaces", "()[Ljava/lang/Class;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Class>? GetInterfaces() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getMethod", "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;")]
         public Java.Lang.Reflect.Method? GetMethod(string? name, params Java.Lang.Class[]? parameterTypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getMethods", "()[Ljava/lang/reflect/Method;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.Method>? GetMethods() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getNestMembers", "()[Ljava/lang/Class;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Class>? GetNestMembers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;")]
         public Java.IO.InputStream? GetResourceAsStream(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getSigners", "()[Ljava/lang/Object;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetSigners() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Reflect.ITypeVariable>? GetTypeParameters() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAnnotationPresent", "(Ljava/lang/Class;)Z")]
         public bool IsAnnotationPresent(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAssignableFrom", "(Ljava/lang/Class;)Z")]
         public bool IsAssignableFrom(Java.Lang.Class? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isInstance", "(Ljava/lang/Object;)Z")]
         public bool IsInstance(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isNestmateOf", "(Ljava/lang/Class;)Z")]
         public bool IsNestmateOf(Java.Lang.Class? c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newInstance", "()Ljava/lang/Object;")]
         [System.ObsoleteAttribute("deprecated")]
         public Java.Lang.Object? NewInstance() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toGenericString", "()Ljava/lang/String;")]
         public string? ToGenericString() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/ClassCastException", GenerateJavaPeer=false)]
@@ -2272,30 +2829,53 @@ protected ClassLoader(string? name, Java.Lang.ClassLoader? parent) { }
         public static Java.Lang.ClassLoader? PlatformClassLoader { get { throw null; } }
         public static Java.Lang.ClassLoader? SystemClassLoader { get { throw null; } }
         public Java.Lang.Module? UnnamedModule { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("clearAssertionStatus", "()V")]
         public virtual void ClearAssertionStatus() { }
+        [Java.Interop.JniMethodSignatureAttribute("defineClass", "([BII)Ljava/lang/Class;")]
         [System.ObsoleteAttribute("deprecated")]
         protected Java.Lang.Class? DefineClass(Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("defineClass", "(Ljava/lang/String;[BII)Ljava/lang/Class;")]
         protected Java.Lang.Class? DefineClass(string? name, Java.Interop.JavaSByteArray? b, int off, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findClass", "(Ljava/lang/String;)Ljava/lang/Class;")]
         protected virtual Java.Lang.Class? FindClass(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findClass", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;")]
         protected virtual Java.Lang.Class? FindClass(string? moduleName, string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findLibrary", "(Ljava/lang/String;)Ljava/lang/String;")]
         protected virtual string? FindLibrary(string? libname) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findLoadedClass", "(Ljava/lang/String;)Ljava/lang/Class;")]
         protected Java.Lang.Class? FindLoadedClass(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findSystemClass", "(Ljava/lang/String;)Ljava/lang/Class;")]
         protected Java.Lang.Class? FindSystemClass(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getClassLoadingLock", "(Ljava/lang/String;)Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? GetClassLoadingLock(string? className) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDefinedPackage", "(Ljava/lang/String;)Ljava/lang/Package;")]
         public Java.Lang.Package? GetDefinedPackage(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDefinedPackages", "()[Ljava/lang/Package;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Package>? GetDefinedPackages() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getPackage", "(Ljava/lang/String;)Ljava/lang/Package;")]
         [System.ObsoleteAttribute("deprecated")]
         protected virtual Java.Lang.Package? GetPackage(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getPackages", "()[Ljava/lang/Package;")]
         protected virtual Java.Interop.JavaObjectArray<Java.Lang.Package>? GetPackages() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;")]
         public virtual Java.IO.InputStream? GetResourceAsStream(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getSystemResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;")]
         public static Java.IO.InputStream? GetSystemResourceAsStream(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("loadClass", "(Ljava/lang/String;)Ljava/lang/Class;")]
         public virtual Java.Lang.Class? LoadClass(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("loadClass", "(Ljava/lang/String;Z)Ljava/lang/Class;")]
         protected virtual Java.Lang.Class? LoadClass(string? name, bool resolve) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("registerAsParallelCapable", "()Z")]
         protected static bool RegisterAsParallelCapable() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("resolveClass", "(Ljava/lang/Class;)V")]
         protected void ResolveClass(Java.Lang.Class? c) { }
+        [Java.Interop.JniMethodSignatureAttribute("setClassAssertionStatus", "(Ljava/lang/String;Z)V")]
         public virtual void SetClassAssertionStatus(string? className, bool enabled) { }
+        [Java.Interop.JniMethodSignatureAttribute("setDefaultAssertionStatus", "(Z)V")]
         public virtual void SetDefaultAssertionStatus(bool enabled) { }
+        [Java.Interop.JniMethodSignatureAttribute("setPackageAssertionStatus", "(Ljava/lang/String;Z)V")]
         public virtual void SetPackageAssertionStatus(string? packageName, bool enabled) { }
+        [Java.Interop.JniMethodSignatureAttribute("setSigners", "(Ljava/lang/Class;[Ljava/lang/Object;)V")]
         protected void SetSigners(Java.Lang.Class? c, Java.Interop.JavaObjectArray<Java.Lang.Object>? signers) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/ClassNotFoundException", GenerateJavaPeer=false)]
@@ -2320,7 +2900,9 @@ protected ClassValue(ref Java.Interop.JniObjectReference reference, Java.Interop
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         protected abstract Java.Lang.Object? ComputeValue(Java.Lang.Class? p0);
+        [Java.Interop.JniMethodSignatureAttribute("get", "(Ljava/lang/Class;)Ljava/lang/Object;")]
         public virtual Java.Lang.Object? Get(Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remove", "(Ljava/lang/Class;)V")]
         public virtual void Remove(Java.Lang.Class? type) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/CloneNotSupportedException", GenerateJavaPeer=false)]
@@ -2341,10 +2923,15 @@ internal Compiler() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("command", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         public static Java.Lang.Object? Command(Java.Lang.Object? any) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compileClass", "(Ljava/lang/Class;)Z")]
         public static bool CompileClass(Java.Lang.Class? clazz) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compileClasses", "(Ljava/lang/String;)Z")]
         public static bool CompileClasses(string? @string) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("disable", "()V")]
         public static void Disable() { }
+        [Java.Interop.JniMethodSignatureAttribute("enable", "()V")]
         public static void Enable() { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Double", GenerateJavaPeer=false)]
@@ -2370,27 +2957,48 @@ public Double(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(DD)I")]
         public static int Compare(double d1, double d2) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Double;)I")]
         public int CompareTo(Java.Lang.Double? anotherDouble) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleToLongBits", "(D)J")]
         public static long DoubleToLongBits(double value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleToRawLongBits", "(D)J")]
         public static long DoubleToRawLongBits(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(D)I")]
         public static int HashCode(double value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isInfinite", "(D)Z")]
         public static bool InvokeIsInfinite(double v) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isNaN", "(D)Z")]
         public static bool InvokeIsNaN(double v) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isFinite", "(D)Z")]
         public static bool IsFinite(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longBitsToDouble", "(J)D")]
         public static double LongBitsToDouble(long p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(DD)D")]
         public static double Max(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(DD)D")]
         public static double Min(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseDouble", "(Ljava/lang/String;)D")]
         public static double ParseDouble(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sum", "(DD)D")]
         public static double Sum(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toHexString", "(D)Ljava/lang/String;")]
         public static string? ToHexString(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(D)Ljava/lang/String;")]
         public static string? ToString(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(D)Ljava/lang/Double;")]
         public static Java.Lang.Double? ValueOf(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Double;")]
         public static Java.Lang.Double? ValueOf(string? s) { throw null; }
     }
     [Java.Interop.JavaTypeParametersAttribute(new string[]{ "E extends java.lang.Enum<E>"})]
@@ -2403,15 +3011,23 @@ protected Enum(string? name, int ordinal) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("clone", "()Ljava/lang/Object;")]
         protected sealed override Java.Lang.Object? Clone() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Enum;)I")]
         public int CompareTo(Java.Lang.Object? o) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("equals", "(Ljava/lang/Object;)Z")]
         public sealed override bool Equals(Java.Lang.Object? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "()I")]
         public sealed override int GetHashCode() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("finalize", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         protected sealed override void JavaFinalize() { }
+        [Java.Interop.JniMethodSignatureAttribute("name", "()Ljava/lang/String;")]
         public string? Name() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ordinal", "()I")]
         public int Ordinal() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.Enum<T>"})]
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;")]
         public static Java.Lang.Object? ValueOf(Java.Lang.Class? enumType, string? name) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/EnumConstantNotPresentException", GenerateJavaPeer=false)]
@@ -2422,7 +3038,9 @@ public EnumConstantNotPresentException(Java.Lang.Class? enumType, string? consta
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("constantName", "()Ljava/lang/String;")]
         public virtual string? ConstantName() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("enumType", "()Ljava/lang/Class;")]
         public virtual Java.Lang.Class? EnumType() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Error", GenerateJavaPeer=false)]
@@ -2488,34 +3106,58 @@ public Float(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(FF)I")]
         public static int Compare(float f1, float f2) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Float;)I")]
         public int CompareTo(Java.Lang.Float? anotherFloat) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatToIntBits", "(F)I")]
         public static int FloatToIntBits(float value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatToRawIntBits", "(F)I")]
         public static int FloatToRawIntBits(float p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(F)I")]
         public static int HashCode(float value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intBitsToFloat", "(I)F")]
         public static float IntBitsToFloat(int p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isInfinite", "(F)Z")]
         public static bool InvokeIsInfinite(float v) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isNaN", "(F)Z")]
         public static bool InvokeIsNaN(float v) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isFinite", "(F)Z")]
         public static bool IsFinite(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(FF)F")]
         public static float Max(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(FF)F")]
         public static float Min(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseFloat", "(Ljava/lang/String;)F")]
         public static float ParseFloat(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sum", "(FF)F")]
         public static float Sum(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toHexString", "(F)Ljava/lang/String;")]
         public static string? ToHexString(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(F)Ljava/lang/String;")]
         public static string? ToString(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(F)Ljava/lang/Float;")]
         public static Java.Lang.Float? ValueOf(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Float;")]
         public static Java.Lang.Float? ValueOf(string? s) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Appendable", GenerateJavaPeer=false)]
     public partial interface IAppendable : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;)Ljava/lang/Appendable;")]
         Java.Lang.IAppendable? Append(Java.Lang.ICharSequence? p0);
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;II)Ljava/lang/Appendable;")]
         Java.Lang.IAppendable? Append(Java.Lang.ICharSequence? p0, int p1, int p2);
+        [Java.Interop.JniMethodSignatureAttribute("append", "(C)Ljava/lang/Appendable;")]
         Java.Lang.IAppendable? Append(char p0);
     }
     public static partial class IAppendableExtensions
@@ -2526,16 +3168,22 @@ public static partial class IAppendableExtensions
     [Java.Interop.JniTypeSignatureAttribute("java/lang/AutoCloseable", GenerateJavaPeer=false)]
     public partial interface IAutoCloseable : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("close", "()V")]
         void Close();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/CharSequence", GenerateJavaPeer=false)]
     public partial interface ICharSequence : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("charAt", "(I)C")]
         char CharAt(int p0);
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)I")]
         int Compare(Java.Lang.ICharSequence? cs1, Java.Lang.ICharSequence? cs2) { throw null; }
         int Compare(string? cs1, string? cs2) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()I")]
         int Length();
+        [Java.Interop.JniMethodSignatureAttribute("subSequence", "(II)Ljava/lang/CharSequence;")]
         Java.Lang.ICharSequence? SubSequenceFormatted(int p0, int p1);
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         string? ToString();
     }
     public static partial class ICharSequenceExtensions
@@ -2551,12 +3199,15 @@ public partial interface ICloneable : Java.Interop.IJavaPeerable, System.IDispos
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Comparable", GenerateJavaPeer=false)]
     public partial interface IComparable : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Object;)I")]
         int CompareTo(Java.Lang.Object? p0);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Deprecated", GenerateJavaPeer=false)]
     public partial interface IDeprecated : Java.Interop.IJavaPeerable, Java.Lang.Annotation.IAnnotation, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("forRemoval", "()Z")]
         bool ForRemoval();
+        [Java.Interop.JniMethodSignatureAttribute("since", "()Ljava/lang/String;")]
         string? Since();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/FunctionalInterface", GenerateJavaPeer=false)]
@@ -2669,6 +3320,7 @@ protected InheritableThreadLocal(ref Java.Interop.JniObjectReference reference,
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("childValue", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? ChildValue(Java.Lang.Object? parentValue) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/InstantiationError", GenerateJavaPeer=false)]
@@ -2706,52 +3358,96 @@ public Integer(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("bitCount", "(I)I")]
         public static int BitCount(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(II)I")]
         public static int Compare(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Integer;)I")]
         public int CompareTo(Java.Lang.Integer? anotherInteger) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareUnsigned", "(II)I")]
         public static int CompareUnsigned(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decode", "(Ljava/lang/String;)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? Decode(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("divideUnsigned", "(II)I")]
         public static int DivideUnsigned(int dividend, int divisor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInteger", "(Ljava/lang/String;)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? GetInteger(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInteger", "(Ljava/lang/String;Ljava/lang/Integer;)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? GetInteger(string? nm, Java.Lang.Integer? val) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInteger", "(Ljava/lang/String;I)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? GetInteger(string? nm, int val) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(I)I")]
         public static int HashCode(int value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("highestOneBit", "(I)I")]
         public static int HighestOneBit(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lowestOneBit", "(I)I")]
         public static int LowestOneBit(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(II)I")]
         public static int Max(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(II)I")]
         public static int Min(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("numberOfLeadingZeros", "(I)I")]
         public static int NumberOfLeadingZeros(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("numberOfTrailingZeros", "(I)I")]
         public static int NumberOfTrailingZeros(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseInt", "(Ljava/lang/CharSequence;III)I")]
         public static int ParseInt(Java.Lang.ICharSequence? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseInt", "(Ljava/lang/String;)I")]
         public static int ParseInt(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseInt", "(Ljava/lang/String;I)I")]
         public static int ParseInt(string? s, int radix) { throw null; }
         public static int ParseInt(string? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedInt", "(Ljava/lang/CharSequence;III)I")]
         public static int ParseUnsignedInt(Java.Lang.ICharSequence? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedInt", "(Ljava/lang/String;)I")]
         public static int ParseUnsignedInt(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedInt", "(Ljava/lang/String;I)I")]
         public static int ParseUnsignedInt(string? s, int radix) { throw null; }
         public static int ParseUnsignedInt(string? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remainderUnsigned", "(II)I")]
         public static int RemainderUnsigned(int dividend, int divisor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverse", "(I)I")]
         public static int Reverse(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverseBytes", "(I)I")]
         public static int ReverseBytes(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rotateLeft", "(II)I")]
         public static int RotateLeft(int i, int distance) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rotateRight", "(II)I")]
         public static int RotateRight(int i, int distance) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(I)I")]
         public static int Signum(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sum", "(II)I")]
         public static int Sum(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toBinaryString", "(I)Ljava/lang/String;")]
         public static string? ToBinaryString(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toHexString", "(I)Ljava/lang/String;")]
         public static string? ToHexString(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toOctalString", "(I)Ljava/lang/String;")]
         public static string? ToOctalString(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(I)Ljava/lang/String;")]
         public static string? ToString(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(II)Ljava/lang/String;")]
         public static string? ToString(int i, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedLong", "(I)J")]
         public static long ToUnsignedLong(int x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedString", "(I)Ljava/lang/String;")]
         public static string? ToUnsignedString(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedString", "(II)Ljava/lang/String;")]
         public static string? ToUnsignedString(int i, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(I)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? ValueOf(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? ValueOf(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;I)Ljava/lang/Integer;")]
         public static Java.Lang.Integer? ValueOf(string? s, int radix) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/InternalError", GenerateJavaPeer=false)]
@@ -2783,6 +3479,7 @@ public partial interface IOverride : Java.Interop.IJavaPeerable, Java.Lang.Annot
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Runnable", GenerateJavaPeer=false)]
     public partial interface IRunnable : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("run", "()V")]
         void Run();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/SafeVarargs", GenerateJavaPeer=false)]
@@ -2792,6 +3489,7 @@ public partial interface ISafeVarargs : Java.Interop.IJavaPeerable, Java.Lang.An
     [Java.Interop.JniTypeSignatureAttribute("java/lang/SuppressWarnings", GenerateJavaPeer=false)]
     public partial interface ISuppressWarnings : Java.Interop.IJavaPeerable, Java.Lang.Annotation.IAnnotation, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("value", "()[Ljava/lang/String;")]
         Java.Interop.JavaObjectArray<string>? Value();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/LayerInstantiationException", GenerateJavaPeer=false)]
@@ -2832,51 +3530,94 @@ public Long(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("bitCount", "(J)I")]
         public static int BitCount(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(JJ)I")]
         public static int Compare(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Long;)I")]
         public int CompareTo(Java.Lang.Long? anotherLong) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareUnsigned", "(JJ)I")]
         public static int CompareUnsigned(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decode", "(Ljava/lang/String;)Ljava/lang/Long;")]
         public static Java.Lang.Long? Decode(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("divideUnsigned", "(JJ)J")]
         public static long DivideUnsigned(long dividend, long divisor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLong", "(Ljava/lang/String;)Ljava/lang/Long;")]
         public static Java.Lang.Long? GetLong(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLong", "(Ljava/lang/String;Ljava/lang/Long;)Ljava/lang/Long;")]
         public static Java.Lang.Long? GetLong(string? nm, Java.Lang.Long? val) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLong", "(Ljava/lang/String;J)Ljava/lang/Long;")]
         public static Java.Lang.Long? GetLong(string? nm, long val) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(J)I")]
         public static int HashCode(long value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("highestOneBit", "(J)J")]
         public static long HighestOneBit(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lowestOneBit", "(J)J")]
         public static long LowestOneBit(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(JJ)J")]
         public static long Max(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(JJ)J")]
         public static long Min(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("numberOfLeadingZeros", "(J)I")]
         public static int NumberOfLeadingZeros(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("numberOfTrailingZeros", "(J)I")]
         public static int NumberOfTrailingZeros(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseLong", "(Ljava/lang/CharSequence;III)J")]
         public static long ParseLong(Java.Lang.ICharSequence? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseLong", "(Ljava/lang/String;)J")]
         public static long ParseLong(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseLong", "(Ljava/lang/String;I)J")]
         public static long ParseLong(string? s, int radix) { throw null; }
         public static long ParseLong(string? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedLong", "(Ljava/lang/CharSequence;III)J")]
         public static long ParseUnsignedLong(Java.Lang.ICharSequence? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedLong", "(Ljava/lang/String;)J")]
         public static long ParseUnsignedLong(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseUnsignedLong", "(Ljava/lang/String;I)J")]
         public static long ParseUnsignedLong(string? s, int radix) { throw null; }
         public static long ParseUnsignedLong(string? s, int beginIndex, int endIndex, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remainderUnsigned", "(JJ)J")]
         public static long RemainderUnsigned(long dividend, long divisor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverse", "(J)J")]
         public static long Reverse(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverseBytes", "(J)J")]
         public static long ReverseBytes(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rotateLeft", "(JI)J")]
         public static long RotateLeft(long i, int distance) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rotateRight", "(JI)J")]
         public static long RotateRight(long i, int distance) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(J)I")]
         public static int Signum(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sum", "(JJ)J")]
         public static long Sum(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toBinaryString", "(J)Ljava/lang/String;")]
         public static string? ToBinaryString(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toHexString", "(J)Ljava/lang/String;")]
         public static string? ToHexString(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toOctalString", "(J)Ljava/lang/String;")]
         public static string? ToOctalString(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(J)Ljava/lang/String;")]
         public static string? ToString(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(JI)Ljava/lang/String;")]
         public static string? ToString(long i, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedString", "(J)Ljava/lang/String;")]
         public static string? ToUnsignedString(long i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedString", "(JI)Ljava/lang/String;")]
         public static string? ToUnsignedString(long i, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(J)Ljava/lang/Long;")]
         public static Java.Lang.Long? ValueOf(long l) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Long;")]
         public static Java.Lang.Long? ValueOf(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;I)Ljava/lang/Long;")]
         public static Java.Lang.Long? ValueOf(string? s, int radix) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Math", GenerateJavaPeer=false)]
@@ -2888,85 +3629,165 @@ internal Math() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(D)D")]
         public static double Abs(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(I)I")]
         public static int Abs(int a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(J)J")]
         public static long Abs(long a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(F)F")]
         public static float Abs(float a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("acos", "(D)D")]
         public static double Acos(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addExact", "(II)I")]
         public static int AddExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addExact", "(JJ)J")]
         public static long AddExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asin", "(D)D")]
         public static double Asin(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("atan", "(D)D")]
         public static double Atan(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("atan2", "(DD)D")]
         public static double Atan2(double y, double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cbrt", "(D)D")]
         public static double Cbrt(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ceil", "(D)D")]
         public static double Ceil(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copySign", "(DD)D")]
         public static double CopySign(double magnitude, double sign) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copySign", "(FF)F")]
         public static float CopySign(float magnitude, float sign) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cos", "(D)D")]
         public static double Cos(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cosh", "(D)D")]
         public static double Cosh(double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decrementExact", "(I)I")]
         public static int DecrementExact(int a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decrementExact", "(J)J")]
         public static long DecrementExact(long a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exp", "(D)D")]
         public static double Exp(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("expm1", "(D)D")]
         public static double Expm1(double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floor", "(D)D")]
         public static double Floor(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(II)I")]
         public static int FloorDiv(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(JI)J")]
         public static long FloorDiv(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(JJ)J")]
         public static long FloorDiv(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(II)I")]
         public static int FloorMod(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(JI)I")]
         public static int FloorMod(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(JJ)J")]
         public static long FloorMod(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fma", "(DDD)D")]
         public static double Fma(double a, double b, double c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fma", "(FFF)F")]
         public static float Fma(float a, float b, float c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getExponent", "(D)I")]
         public static int GetExponent(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getExponent", "(F)I")]
         public static int GetExponent(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hypot", "(DD)D")]
         public static double Hypot(double x, double y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("IEEEremainder", "(DD)D")]
         public static double IEEEremainder(double f1, double f2) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("incrementExact", "(I)I")]
         public static int IncrementExact(int a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("incrementExact", "(J)J")]
         public static long IncrementExact(long a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log", "(D)D")]
         public static double Log(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log10", "(D)D")]
         public static double Log10(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log1p", "(D)D")]
         public static double Log1p(double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(DD)D")]
         public static double Max(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(II)I")]
         public static int Max(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(JJ)J")]
         public static long Max(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(FF)F")]
         public static float Max(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(DD)D")]
         public static double Min(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(II)I")]
         public static int Min(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(JJ)J")]
         public static long Min(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(FF)F")]
         public static float Min(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(II)I")]
         public static int MultiplyExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(JI)J")]
         public static long MultiplyExact(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(JJ)J")]
         public static long MultiplyExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyFull", "(II)J")]
         public static long MultiplyFull(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyHigh", "(JJ)J")]
         public static long MultiplyHigh(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("negateExact", "(I)I")]
         public static int NegateExact(int a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("negateExact", "(J)J")]
         public static long NegateExact(long a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextAfter", "(DD)D")]
         public static double NextAfter(double start, double direction) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextAfter", "(FD)F")]
         public static float NextAfter(float start, double direction) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextDown", "(D)D")]
         public static double NextDown(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextDown", "(F)F")]
         public static float NextDown(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextUp", "(D)D")]
         public static double NextUp(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextUp", "(F)F")]
         public static float NextUp(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("pow", "(DD)D")]
         public static double Pow(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("random", "()D")]
         public static double Random() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rint", "(D)D")]
         public static double Rint(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("round", "(D)J")]
         public static long Round(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("round", "(F)I")]
         public static int Round(float a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("scalb", "(DI)D")]
         public static double Scalb(double d, int scaleFactor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("scalb", "(FI)F")]
         public static float Scalb(float f, int scaleFactor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(D)D")]
         public static double Signum(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(F)F")]
         public static float Signum(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sin", "(D)D")]
         public static double Sin(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sinh", "(D)D")]
         public static double Sinh(double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sqrt", "(D)D")]
         public static double Sqrt(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subtractExact", "(II)I")]
         public static int SubtractExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subtractExact", "(JJ)J")]
         public static long SubtractExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("tan", "(D)D")]
         public static double Tan(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("tanh", "(D)D")]
         public static double Tanh(double x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toDegrees", "(D)D")]
         public static double ToDegrees(double angrad) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toIntExact", "(J)I")]
         public static int ToIntExact(long value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toRadians", "(D)D")]
         public static double ToRadians(double angdeg) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ulp", "(D)D")]
         public static double Ulp(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ulp", "(F)F")]
         public static float Ulp(float f) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Module", GenerateJavaPeer=false)]
@@ -2981,20 +3802,34 @@ internal Module() { }
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public Java.Lang.ModuleLayer? Layer { get { throw null; } }
         public string? Name { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("addExports", "(Ljava/lang/String;Ljava/lang/Module;)Ljava/lang/Module;")]
         public Java.Lang.Module? AddExports(string? pn, Java.Lang.Module? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addOpens", "(Ljava/lang/String;Ljava/lang/Module;)Ljava/lang/Module;")]
         public Java.Lang.Module? AddOpens(string? pn, Java.Lang.Module? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addReads", "(Ljava/lang/Module;)Ljava/lang/Module;")]
         public Java.Lang.Module? AddReads(Java.Lang.Module? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addUses", "(Ljava/lang/Class;)Ljava/lang/Module;")]
         public Java.Lang.Module? AddUses(Java.Lang.Class? service) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("canRead", "(Ljava/lang/Module;)Z")]
         public bool CanRead(Java.Lang.Module? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("canUse", "(Ljava/lang/Class;)Z")]
         public bool CanUse(Java.Lang.Class? service) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public Java.Lang.Object? GetAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getResourceAsStream", "(Ljava/lang/String;)Ljava/io/InputStream;")]
         public Java.IO.InputStream? GetResourceAsStream(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isExported", "(Ljava/lang/String;)Z")]
         public bool IsExported(string? pn) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isExported", "(Ljava/lang/String;Ljava/lang/Module;)Z")]
         public bool IsExported(string? pn, Java.Lang.Module? other) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isOpen", "(Ljava/lang/String;)Z")]
         public bool IsOpen(string? pn) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isOpen", "(Ljava/lang/String;Ljava/lang/Module;)Z")]
         public bool IsOpen(string? pn, Java.Lang.Module? other) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/ModuleLayer", GenerateJavaPeer=false)]
@@ -3004,11 +3839,17 @@ internal ModuleLayer() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("boot", "()Ljava/lang/ModuleLayer;")]
         public static Java.Lang.ModuleLayer? Boot() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("configuration", "()Ljava/lang/module/Configuration;")]
         public Java.Lang.Modules.Configuration? Configuration() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("defineModulesWithManyLoaders", "(Ljava/lang/module/Configuration;Ljava/lang/ClassLoader;)Ljava/lang/ModuleLayer;")]
         public Java.Lang.ModuleLayer? DefineModulesWithManyLoaders(Java.Lang.Modules.Configuration? cf, Java.Lang.ClassLoader? parentLoader) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("defineModulesWithOneLoader", "(Ljava/lang/module/Configuration;Ljava/lang/ClassLoader;)Ljava/lang/ModuleLayer;")]
         public Java.Lang.ModuleLayer? DefineModulesWithOneLoader(Java.Lang.Modules.Configuration? cf, Java.Lang.ClassLoader? parentLoader) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("empty", "()Ljava/lang/ModuleLayer;")]
         public static Java.Lang.ModuleLayer? Empty() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("findLoader", "(Ljava/lang/String;)Ljava/lang/ClassLoader;")]
         public Java.Lang.ClassLoader? FindLoader(string? name) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/ModuleLayer$Controller", GenerateJavaPeer=false)]
         public sealed partial class Controller : Java.Lang.Object
@@ -3017,9 +3858,13 @@ internal Controller() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("addExports", "(Ljava/lang/Module;Ljava/lang/String;Ljava/lang/Module;)Ljava/lang/ModuleLayer$Controller;")]
             public Java.Lang.ModuleLayer.Controller? AddExports(Java.Lang.Module? source, string? pn, Java.Lang.Module? target) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("addOpens", "(Ljava/lang/Module;Ljava/lang/String;Ljava/lang/Module;)Ljava/lang/ModuleLayer$Controller;")]
             public Java.Lang.ModuleLayer.Controller? AddOpens(Java.Lang.Module? source, string? pn, Java.Lang.Module? target) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("addReads", "(Ljava/lang/Module;Ljava/lang/Module;)Ljava/lang/ModuleLayer$Controller;")]
             public Java.Lang.ModuleLayer.Controller? AddReads(Java.Lang.Module? source, Java.Lang.Module? target) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("layer", "()Ljava/lang/ModuleLayer;")]
             public Java.Lang.ModuleLayer? Layer() { throw null; }
         }
     }
@@ -3101,11 +3946,13 @@ protected Number(ref Java.Interop.JniObjectReference reference, Java.Interop.Jni
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("byteValue", "()B")]
         public virtual sbyte ByteValue() { throw null; }
         public abstract double DoubleValue();
         public abstract float FloatValue();
         public abstract int IntValue();
         public abstract long LongValue();
+        [Java.Interop.JniMethodSignatureAttribute("shortValue", "()S")]
         public virtual short ShortValue() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/NumberFormatException", GenerateJavaPeer=false)]
@@ -3124,16 +3971,26 @@ public partial class Object : Java.Interop.JavaObject
         public Object() { }
         public Object(ref Java.Interop.JniObjectReference reference, Java.Interop.JniObjectReferenceOptions options) { }
         public Java.Lang.Class? Class { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("clone", "()Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? Clone() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("equals", "(Ljava/lang/Object;)Z")]
         public virtual bool Equals(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "()I")]
         public override int GetHashCode() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("finalize", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         protected virtual void JavaFinalize() { }
+        [Java.Interop.JniMethodSignatureAttribute("notify", "()V")]
         public void Notify() { }
+        [Java.Interop.JniMethodSignatureAttribute("notifyAll", "()V")]
         public void NotifyAll() { }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         public override string? ToString() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("wait", "()V")]
         public void Wait() { }
+        [Java.Interop.JniMethodSignatureAttribute("wait", "(J)V")]
         public void Wait(long p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("wait", "(JI)V")]
         public void Wait(long timeoutMillis, int nanos) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/OutOfMemoryError", GenerateJavaPeer=false)]
@@ -3162,19 +4019,29 @@ protected Package(ref Java.Interop.JniObjectReference reference, Java.Interop.Jn
         public virtual string? SpecificationVendor { get { throw null; } }
         public virtual string? SpecificationVersion { get { throw null; } }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public virtual Java.Lang.Object? GetAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Object>? GetAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public virtual Java.Lang.Object? GetDeclaredAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "A extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Object>? GetDeclaredAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getPackage", "(Ljava/lang/String;)Ljava/lang/Package;")]
         [System.ObsoleteAttribute("deprecated")]
         public static Java.Lang.Package? GetPackage(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getPackages", "()[Ljava/lang/Package;")]
         public static Java.Interop.JavaObjectArray<Java.Lang.Package>? GetPackages() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAnnotationPresent", "(Ljava/lang/Class;)Z")]
         public virtual bool IsAnnotationPresent(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isCompatibleWith", "(Ljava/lang/String;)Z")]
         public virtual bool IsCompatibleWith(string? desired) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Process", GenerateJavaPeer=false)]
@@ -3182,17 +4049,20 @@ public abstract partial class Process : Java.Lang.Object
     {
         public Process() { }
         protected Process(ref Java.Interop.JniObjectReference reference, Java.Interop.JniObjectReferenceOptions options) { }
-        public abstract Java.IO.InputStream? ErrorStream { get; }
-        public abstract Java.IO.InputStream? InputStream { get; }
+        public abstract Java.IO.InputStream? ErrorStream { [Java.Interop.JniMethodSignatureAttribute("getErrorStream", "()Ljava/io/InputStream;")] get; }
+        public abstract Java.IO.InputStream? InputStream { [Java.Interop.JniMethodSignatureAttribute("getInputStream", "()Ljava/io/InputStream;")] get; }
         public virtual bool IsAlive { get { throw null; } }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
-        public abstract Java.IO.OutputStream? OutputStream { get; }
+        public abstract Java.IO.OutputStream? OutputStream { [Java.Interop.JniMethodSignatureAttribute("getOutputStream", "()Ljava/io/OutputStream;")] get; }
         public abstract void Destroy();
+        [Java.Interop.JniMethodSignatureAttribute("destroyForcibly", "()Ljava/lang/Process;")]
         public virtual Java.Lang.Process? DestroyForcibly() { throw null; }
         public abstract int ExitValue();
+        [Java.Interop.JniMethodSignatureAttribute("pid", "()J")]
         public virtual long Pid() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("supportsNormalTermination", "()Z")]
         public virtual bool SupportsNormalTermination() { throw null; }
         public abstract int WaitFor();
     }
@@ -3203,21 +4073,37 @@ public ProcessBuilder(params string[]? command) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("command", "([Ljava/lang/String;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? Command(params string[]? command) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("directory", "()Ljava/io/File;")]
         public Java.IO.File? Directory() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("directory", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? Directory(Java.IO.File? directory) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("inheritIO", "()Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? InheritIO() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectError", "()Ljava/lang/ProcessBuilder$Redirect;")]
         public Java.Lang.ProcessBuilder.Redirect? RedirectError() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectError", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectError(Java.IO.File? file) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectError", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectError(Java.Lang.ProcessBuilder.Redirect? destination) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectErrorStream", "()Z")]
         public bool RedirectErrorStream() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectErrorStream", "(Z)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectErrorStream(bool redirectErrorStream) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectInput", "()Ljava/lang/ProcessBuilder$Redirect;")]
         public Java.Lang.ProcessBuilder.Redirect? RedirectInput() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectInput", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectInput(Java.IO.File? file) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectInput", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectInput(Java.Lang.ProcessBuilder.Redirect? source) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectOutput", "()Ljava/lang/ProcessBuilder$Redirect;")]
         public Java.Lang.ProcessBuilder.Redirect? RedirectOutput() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectOutput", "(Ljava/io/File;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectOutput(Java.IO.File? file) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("redirectOutput", "(Ljava/lang/ProcessBuilder$Redirect;)Ljava/lang/ProcessBuilder;")]
         public Java.Lang.ProcessBuilder? RedirectOutput(Java.Lang.ProcessBuilder.Redirect? destination) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("start", "()Ljava/lang/Process;")]
         public Java.Lang.Process? Start() { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/ProcessBuilder$Redirect", GenerateJavaPeer=false)]
         public abstract partial class Redirect : Java.Lang.Object
@@ -3229,10 +4115,14 @@ protected Redirect(ref Java.Interop.JniObjectReference reference, Java.Interop.J
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
             public static Java.Lang.ProcessBuilder.Redirect? Pipe { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("appendTo", "(Ljava/io/File;)Ljava/lang/ProcessBuilder$Redirect;")]
             public static Java.Lang.ProcessBuilder.Redirect? AppendTo(Java.IO.File? file) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("file", "()Ljava/io/File;")]
             public virtual Java.IO.File? File() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("from", "(Ljava/io/File;)Ljava/lang/ProcessBuilder$Redirect;")]
             public static Java.Lang.ProcessBuilder.Redirect? From(Java.IO.File? file) { throw null; }
             public abstract Java.Lang.ProcessBuilder.Redirect.Type? InvokeType();
+            [Java.Interop.JniMethodSignatureAttribute("to", "(Ljava/io/File;)Ljava/lang/ProcessBuilder$Redirect;")]
             public static Java.Lang.ProcessBuilder.Redirect? To(Java.IO.File? file) { throw null; }
             [Java.Interop.JniTypeSignatureAttribute("java/lang/ProcessBuilder$Redirect$Type", GenerateJavaPeer=false)]
             public sealed partial class Type : Java.Lang.Enum
@@ -3246,7 +4136,9 @@ public sealed partial class Type : Java.Lang.Enum
                 public static Java.Lang.ProcessBuilder.Redirect.Type? Pipe { get { throw null; } }
                 public static Java.Lang.ProcessBuilder.Redirect.Type? Read { get { throw null; } }
                 public static Java.Lang.ProcessBuilder.Redirect.Type? Write { get { throw null; } }
+                [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/ProcessBuilder$Redirect$Type;")]
                 public static Java.Lang.ProcessBuilder.Redirect.Type? ValueOf(string? name) { throw null; }
+                [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/ProcessBuilder$Redirect$Type;")]
                 public static Java.Interop.JavaObjectArray<Java.Lang.ProcessBuilder.Redirect.Type>? Values() { throw null; }
             }
         }
@@ -3270,28 +4162,50 @@ protected Runtime(ref Java.Interop.JniObjectReference reference, Java.Interop.Jn
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("addShutdownHook", "(Ljava/lang/Thread;)V")]
         public virtual void AddShutdownHook(Java.Lang.Thread? hook) { }
+        [Java.Interop.JniMethodSignatureAttribute("availableProcessors", "()I")]
         public virtual int AvailableProcessors() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "([Ljava/lang/String;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(Java.Interop.JavaObjectArray<string>? cmdarray) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "([Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(Java.Interop.JavaObjectArray<string>? cmdarray, Java.Interop.JavaObjectArray<string>? envp) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "([Ljava/lang/String;[Ljava/lang/String;Ljava/io/File;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(Java.Interop.JavaObjectArray<string>? cmdarray, Java.Interop.JavaObjectArray<string>? envp, Java.IO.File? dir) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "(Ljava/lang/String;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(string? command) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "(Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(string? command, Java.Interop.JavaObjectArray<string>? envp) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exec", "(Ljava/lang/String;[Ljava/lang/String;Ljava/io/File;)Ljava/lang/Process;")]
         public virtual Java.Lang.Process? Exec(string? command, Java.Interop.JavaObjectArray<string>? envp, Java.IO.File? dir) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exit", "(I)V")]
         public virtual void Exit(int status) { }
+        [Java.Interop.JniMethodSignatureAttribute("freeMemory", "()J")]
         public virtual long FreeMemory() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("gc", "()V")]
         public virtual void Gc() { }
+        [Java.Interop.JniMethodSignatureAttribute("getRuntime", "()Ljava/lang/Runtime;")]
         public static Java.Lang.Runtime? GetRuntime() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("halt", "(I)V")]
         public virtual void Halt(int status) { }
+        [Java.Interop.JniMethodSignatureAttribute("version", "()Ljava/lang/Runtime$Version;")]
         public static Java.Lang.Runtime.Version? InvokeVersion() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("load", "(Ljava/lang/String;)V")]
         public virtual void Load(string? filename) { }
+        [Java.Interop.JniMethodSignatureAttribute("loadLibrary", "(Ljava/lang/String;)V")]
         public virtual void LoadLibrary(string? libname) { }
+        [Java.Interop.JniMethodSignatureAttribute("maxMemory", "()J")]
         public virtual long MaxMemory() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("removeShutdownHook", "(Ljava/lang/Thread;)Z")]
         public virtual bool RemoveShutdownHook(Java.Lang.Thread? hook) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("runFinalization", "()V")]
         public virtual void RunFinalization() { }
+        [Java.Interop.JniMethodSignatureAttribute("totalMemory", "()J")]
         public virtual long TotalMemory() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("traceInstructions", "(Z)V")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual void TraceInstructions(bool on) { }
+        [Java.Interop.JniMethodSignatureAttribute("traceMethodCalls", "(Z)V")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual void TraceMethodCalls(bool on) { }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Runtime$Version", GenerateJavaPeer=false)]
@@ -3301,20 +4215,31 @@ internal Version() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Runtime$Version;)I")]
             public int CompareTo(Java.Lang.Runtime.Version? obj) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("compareToIgnoreOptional", "(Ljava/lang/Runtime$Version;)I")]
             public int CompareToIgnoreOptional(Java.Lang.Runtime.Version? obj) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("equalsIgnoreOptional", "(Ljava/lang/Object;)Z")]
             public bool EqualsIgnoreOptional(Java.Lang.Object? obj) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("feature", "()I")]
             public int Feature() { throw null; }
             int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("interim", "()I")]
             public int Interim() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("major", "()I")]
             [System.ObsoleteAttribute("deprecated")]
             public int Major() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("minor", "()I")]
             [System.ObsoleteAttribute("deprecated")]
             public int Minor() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("parse", "(Ljava/lang/String;)Ljava/lang/Runtime$Version;")]
             public static Java.Lang.Runtime.Version? Parse(string? s) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("patch", "()I")]
             public int Patch() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("security", "()I")]
             [System.ObsoleteAttribute("deprecated")]
             public int Security() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("update", "()I")]
             public int Update() { throw null; }
         }
     }
@@ -3353,29 +4278,53 @@ protected SecurityManager(ref Java.Interop.JniObjectReference reference, Java.In
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public virtual Java.Lang.Object? SecurityContext { get { throw null; } }
         public virtual Java.Lang.ThreadGroup? ThreadGroup { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("checkAccept", "(Ljava/lang/String;I)V")]
         public virtual void CheckAccept(string? host, int port) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkAccess", "(Ljava/lang/Thread;)V")]
         public virtual void CheckAccess(Java.Lang.Thread? t) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkAccess", "(Ljava/lang/ThreadGroup;)V")]
         public virtual void CheckAccess(Java.Lang.ThreadGroup? g) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkConnect", "(Ljava/lang/String;I)V")]
         public virtual void CheckConnect(string? host, int port) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkConnect", "(Ljava/lang/String;ILjava/lang/Object;)V")]
         public virtual void CheckConnect(string? host, int port, Java.Lang.Object? context) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkCreateClassLoader", "()V")]
         public virtual void CheckCreateClassLoader() { }
+        [Java.Interop.JniMethodSignatureAttribute("checkDelete", "(Ljava/lang/String;)V")]
         public virtual void CheckDelete(string? file) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkExec", "(Ljava/lang/String;)V")]
         public virtual void CheckExec(string? cmd) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkExit", "(I)V")]
         public virtual void CheckExit(int status) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkLink", "(Ljava/lang/String;)V")]
         public virtual void CheckLink(string? lib) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkListen", "(I)V")]
         public virtual void CheckListen(int port) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkPackageAccess", "(Ljava/lang/String;)V")]
         public virtual void CheckPackageAccess(string? pkg) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkPackageDefinition", "(Ljava/lang/String;)V")]
         public virtual void CheckPackageDefinition(string? pkg) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkPrintJobAccess", "()V")]
         public virtual void CheckPrintJobAccess() { }
+        [Java.Interop.JniMethodSignatureAttribute("checkPropertiesAccess", "()V")]
         public virtual void CheckPropertiesAccess() { }
+        [Java.Interop.JniMethodSignatureAttribute("checkPropertyAccess", "(Ljava/lang/String;)V")]
         public virtual void CheckPropertyAccess(string? key) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkRead", "(Ljava/io/FileDescriptor;)V")]
         public virtual void CheckRead(Java.IO.FileDescriptor? fd) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkRead", "(Ljava/lang/String;)V")]
         public virtual void CheckRead(string? file) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkRead", "(Ljava/lang/String;Ljava/lang/Object;)V")]
         public virtual void CheckRead(string? file, Java.Lang.Object? context) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkSecurityAccess", "(Ljava/lang/String;)V")]
         public virtual void CheckSecurityAccess(string? target) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkSetFactory", "()V")]
         public virtual void CheckSetFactory() { }
+        [Java.Interop.JniMethodSignatureAttribute("checkWrite", "(Ljava/io/FileDescriptor;)V")]
         public virtual void CheckWrite(Java.IO.FileDescriptor? fd) { }
+        [Java.Interop.JniMethodSignatureAttribute("checkWrite", "(Ljava/lang/String;)V")]
         public virtual void CheckWrite(string? file) { }
+        [Java.Interop.JniMethodSignatureAttribute("getClassContext", "()[Ljava/lang/Class;")]
         protected virtual Java.Interop.JavaObjectArray<Java.Lang.Class>? GetClassContext() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Short", GenerateJavaPeer=false)]
@@ -3393,24 +4342,42 @@ public Short(string? s) { }
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compare", "(SS)I")]
         public static int Compare(short x, short y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/Short;)I")]
         public int CompareTo(Java.Lang.Short? anotherShort) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareUnsigned", "(SS)I")]
         public static int CompareUnsigned(short x, short y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("decode", "(Ljava/lang/String;)Ljava/lang/Short;")]
         public static Java.Lang.Short? Decode(string? nm) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doubleValue", "()D")]
         public override double DoubleValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floatValue", "()F")]
         public override float FloatValue() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "(S)I")]
         public static int HashCode(short value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intValue", "()I")]
         public override int IntValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("longValue", "()J")]
         public override long LongValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseShort", "(Ljava/lang/String;)S")]
         public static short ParseShort(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parseShort", "(Ljava/lang/String;I)S")]
         public static short ParseShort(string? s, int radix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverseBytes", "(S)S")]
         public static short ReverseBytes(short i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(S)Ljava/lang/String;")]
         public static string? ToString(short s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedInt", "(S)I")]
         public static int ToUnsignedInt(short x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUnsignedLong", "(S)J")]
         public static long ToUnsignedLong(short x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(S)Ljava/lang/Short;")]
         public static Java.Lang.Short? ValueOf(short s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Short;")]
         public static Java.Lang.Short? ValueOf(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;I)Ljava/lang/Short;")]
         public static Java.Lang.Short? ValueOf(string? s, int radix) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/StackOverflowError", GenerateJavaPeer=false)]
@@ -3449,19 +4416,21 @@ internal StackWalker() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getInstance", "(Ljava/lang/StackWalker$Option;)Ljava/lang/StackWalker;")]
         public static Java.Lang.StackWalker? GetInstance(Java.Lang.StackWalker.Option? option) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/StackWalker$StackFrame", GenerateJavaPeer=false)]
         public partial interface IStackFrame : Java.Interop.IJavaPeerable, System.IDisposable
         {
-            int ByteCodeIndex { get; }
-            string? ClassName { get; }
-            Java.Lang.Class? DeclaringClass { get; }
+            int ByteCodeIndex { [Java.Interop.JniMethodSignatureAttribute("getByteCodeIndex", "()I")] get; }
+            string? ClassName { [Java.Interop.JniMethodSignatureAttribute("getClassName", "()Ljava/lang/String;")] get; }
+            Java.Lang.Class? DeclaringClass { [Java.Interop.JniMethodSignatureAttribute("getDeclaringClass", "()Ljava/lang/Class;")] get; }
             string? Descriptor { get { throw null; } }
-            string? FileName { get; }
-            bool IsNativeMethod { get; }
-            int LineNumber { get; }
-            string? MethodName { get; }
+            string? FileName { [Java.Interop.JniMethodSignatureAttribute("getFileName", "()Ljava/lang/String;")] get; }
+            bool IsNativeMethod { [Java.Interop.JniMethodSignatureAttribute("isNativeMethod", "()Z")] get; }
+            int LineNumber { [Java.Interop.JniMethodSignatureAttribute("getLineNumber", "()I")] get; }
+            string? MethodName { [Java.Interop.JniMethodSignatureAttribute("getMethodName", "()Ljava/lang/String;")] get; }
             Java.Lang.Invoke.MethodType? MethodType { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("toStackTraceElement", "()Ljava/lang/StackTraceElement;")]
             Java.Lang.StackTraceElement? ToStackTraceElement();
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/StackWalker$Option", GenerateJavaPeer=false)]
@@ -3474,7 +4443,9 @@ public sealed partial class Option : Java.Lang.Enum
             public static Java.Lang.StackWalker.Option? RetainClassReference { get { throw null; } }
             public static Java.Lang.StackWalker.Option? ShowHiddenFrames { get { throw null; } }
             public static Java.Lang.StackWalker.Option? ShowReflectFrames { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/StackWalker$Option;")]
             public static Java.Lang.StackWalker.Option? ValueOf(string? name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/StackWalker$Option;")]
             public static Java.Interop.JavaObjectArray<Java.Lang.StackWalker.Option>? Values() { throw null; }
         }
     }
@@ -3487,79 +4458,153 @@ internal StrictMath() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(D)D")]
         public static double Abs(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(I)I")]
         public static int Abs(int a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(J)J")]
         public static long Abs(long a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("abs", "(F)F")]
         public static float Abs(float a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("acos", "(D)D")]
         public static double Acos(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addExact", "(II)I")]
         public static int AddExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("addExact", "(JJ)J")]
         public static long AddExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asin", "(D)D")]
         public static double Asin(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("atan", "(D)D")]
         public static double Atan(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("atan2", "(DD)D")]
         public static double Atan2(double p0, double p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cbrt", "(D)D")]
         public static double Cbrt(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ceil", "(D)D")]
         public static double Ceil(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copySign", "(DD)D")]
         public static double CopySign(double magnitude, double sign) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copySign", "(FF)F")]
         public static float CopySign(float magnitude, float sign) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cos", "(D)D")]
         public static double Cos(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("cosh", "(D)D")]
         public static double Cosh(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exp", "(D)D")]
         public static double Exp(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("expm1", "(D)D")]
         public static double Expm1(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floor", "(D)D")]
         public static double Floor(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(II)I")]
         public static int FloorDiv(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(JI)J")]
         public static long FloorDiv(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorDiv", "(JJ)J")]
         public static long FloorDiv(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(II)I")]
         public static int FloorMod(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(JI)I")]
         public static int FloorMod(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("floorMod", "(JJ)J")]
         public static long FloorMod(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fma", "(DDD)D")]
         public static double Fma(double a, double b, double c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fma", "(FFF)F")]
         public static float Fma(float a, float b, float c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getExponent", "(D)I")]
         public static int GetExponent(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getExponent", "(F)I")]
         public static int GetExponent(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("hypot", "(DD)D")]
         public static double Hypot(double x, double y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("IEEEremainder", "(DD)D")]
         public static double IEEEremainder(double p0, double p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log", "(D)D")]
         public static double Log(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log10", "(D)D")]
         public static double Log10(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("log1p", "(D)D")]
         public static double Log1p(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(DD)D")]
         public static double Max(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(II)I")]
         public static int Max(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(JJ)J")]
         public static long Max(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("max", "(FF)F")]
         public static float Max(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(DD)D")]
         public static double Min(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(II)I")]
         public static int Min(int a, int b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(JJ)J")]
         public static long Min(long a, long b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("min", "(FF)F")]
         public static float Min(float a, float b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(II)I")]
         public static int MultiplyExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(JI)J")]
         public static long MultiplyExact(long x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyExact", "(JJ)J")]
         public static long MultiplyExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyFull", "(II)J")]
         public static long MultiplyFull(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("multiplyHigh", "(JJ)J")]
         public static long MultiplyHigh(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextAfter", "(DD)D")]
         public static double NextAfter(double start, double direction) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextAfter", "(FD)F")]
         public static float NextAfter(float start, double direction) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextDown", "(D)D")]
         public static double NextDown(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextDown", "(F)F")]
         public static float NextDown(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextUp", "(D)D")]
         public static double NextUp(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nextUp", "(F)F")]
         public static float NextUp(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("pow", "(DD)D")]
         public static double Pow(double a, double b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("random", "()D")]
         public static double Random() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("rint", "(D)D")]
         public static double Rint(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("round", "(D)J")]
         public static long Round(double a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("round", "(F)I")]
         public static int Round(float a) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("scalb", "(DI)D")]
         public static double Scalb(double d, int scaleFactor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("scalb", "(FI)F")]
         public static float Scalb(float f, int scaleFactor) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(D)D")]
         public static double Signum(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("signum", "(F)F")]
         public static float Signum(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sin", "(D)D")]
         public static double Sin(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sinh", "(D)D")]
         public static double Sinh(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("sqrt", "(D)D")]
         public static double Sqrt(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subtractExact", "(II)I")]
         public static int SubtractExact(int x, int y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subtractExact", "(JJ)J")]
         public static long SubtractExact(long x, long y) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("tan", "(D)D")]
         public static double Tan(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("tanh", "(D)D")]
         public static double Tanh(double p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toDegrees", "(D)D")]
         public static double ToDegrees(double angrad) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toIntExact", "(J)I")]
         public static int ToIntExact(long value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toRadians", "(D)D")]
         public static double ToRadians(double angdeg) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ulp", "(D)D")]
         public static double Ulp(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ulp", "(F)F")]
         public static float Ulp(float f) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/String", GenerateJavaPeer=false)]
@@ -3585,76 +4630,138 @@ public String(string? original) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("charAt", "(I)C")]
         public char CharAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "(I)I")]
         public int CodePointAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "(I)I")]
         public int CodePointBefore(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointCount", "(II)I")]
         public int CodePointCount(int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/String;)I")]
         public int CompareTo(string? anotherString) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareToIgnoreCase", "(Ljava/lang/String;)I")]
         public int CompareToIgnoreCase(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("concat", "(Ljava/lang/String;)Ljava/lang/String;")]
         public string? Concat(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("contains", "(Ljava/lang/CharSequence;)Z")]
         public bool Contains(Java.Lang.ICharSequence? s) { throw null; }
         public bool Contains(string? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("contentEquals", "(Ljava/lang/CharSequence;)Z")]
         public bool ContentEquals(Java.Lang.ICharSequence? cs) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("contentEquals", "(Ljava/lang/StringBuffer;)Z")]
         public bool ContentEquals(Java.Lang.StringBuffer? sb) { throw null; }
         public bool ContentEquals(string? cs) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copyValueOf", "([C)Ljava/lang/String;")]
         public static string? CopyValueOf(Java.Interop.JavaCharArray? data) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("copyValueOf", "([CII)Ljava/lang/String;")]
         public static string? CopyValueOf(Java.Interop.JavaCharArray? data, int offset, int count) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("endsWith", "(Ljava/lang/String;)Z")]
         public bool EndsWith(string? suffix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("equalsIgnoreCase", "(Ljava/lang/String;)Z")]
         public bool EqualsIgnoreCase(string? anotherString) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;")]
         public static string? Format(string? format, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getBytes", "()[B")]
         public Java.Interop.JavaSByteArray? GetBytes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getBytes", "(II[BI)V")]
         [System.ObsoleteAttribute("deprecated")]
         public void GetBytes(int srcBegin, int srcEnd, Java.Interop.JavaSByteArray? dst, int dstBegin) { }
+        [Java.Interop.JniMethodSignatureAttribute("getBytes", "(Ljava/lang/String;)[B")]
         public Java.Interop.JavaSByteArray? GetBytes(string? charsetName) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getChars", "(II[CI)V")]
         public void GetChars(int srcBegin, int srcEnd, Java.Interop.JavaCharArray? dst, int dstBegin) { }
         public System.Collections.Generic.IEnumerator<char> GetEnumerator() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(I)I")]
         public int IndexOf(int ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(II)I")]
         public int IndexOf(int ch, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;)I")]
         public int IndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;I)I")]
         public int IndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("intern", "()Ljava/lang/String;")]
         public string? Intern() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("join", "(Ljava/lang/CharSequence;[Ljava/lang/CharSequence;)Ljava/lang/String;")]
         public static string? Join(Java.Lang.ICharSequence? delimiter, params Java.Lang.ICharSequence[]? elements) { throw null; }
         public static string? Join(string? delimiter, params string[]? elements) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(I)I")]
         public int LastIndexOf(int ch) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(II)I")]
         public int LastIndexOf(int ch, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;)I")]
         public int LastIndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;I)I")]
         public int LastIndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()I")]
         public int Length() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("matches", "(Ljava/lang/String;)Z")]
         public bool Matches(string? regex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("offsetByCodePoints", "(II)I")]
         public int OffsetByCodePoints(int index, int codePointOffset) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("regionMatches", "(ZILjava/lang/String;II)Z")]
         public bool RegionMatches(bool ignoreCase, int toffset, string? other, int ooffset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("regionMatches", "(ILjava/lang/String;II)Z")]
         public bool RegionMatches(int toffset, string? other, int ooffset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("repeat", "(I)Ljava/lang/String;")]
         public string? Repeat(int count) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replace", "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;")]
         public string? Replace(Java.Lang.ICharSequence? target, Java.Lang.ICharSequence? replacement) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replace", "(CC)Ljava/lang/String;")]
         public string? Replace(char oldChar, char newChar) { throw null; }
         public string? Replace(string? target, string? replacement) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replaceAll", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;")]
         public string? ReplaceAll(string? regex, string? replacement) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replaceFirst", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;")]
         public string? ReplaceFirst(string? regex, string? replacement) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("split", "(Ljava/lang/String;)[Ljava/lang/String;")]
         public Java.Interop.JavaObjectArray<string>? Split(string? regex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("split", "(Ljava/lang/String;I)[Ljava/lang/String;")]
         public Java.Interop.JavaObjectArray<string>? Split(string? regex, int limit) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("startsWith", "(Ljava/lang/String;)Z")]
         public bool StartsWith(string? prefix) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("startsWith", "(Ljava/lang/String;I)Z")]
         public bool StartsWith(string? prefix, int toffset) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("strip", "()Ljava/lang/String;")]
         public string? Strip() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("stripLeading", "()Ljava/lang/String;")]
         public string? StripLeading() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("stripTrailing", "()Ljava/lang/String;")]
         public string? StripTrailing() { throw null; }
         public string? SubSequence(int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subSequence", "(II)Ljava/lang/CharSequence;")]
         public Java.Lang.ICharSequence? SubSequenceFormatted(int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(I)Ljava/lang/String;")]
         public string? Substring(int beginIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(II)Ljava/lang/String;")]
         public string? Substring(int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toCharArray", "()[C")]
         public Java.Interop.JavaCharArray? ToCharArray() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toLowerCase", "()Ljava/lang/String;")]
         public string? ToLowerCase() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toUpperCase", "()Ljava/lang/String;")]
         public string? ToUpperCase() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("trim", "()Ljava/lang/String;")]
         public string? Trim() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "([C)Ljava/lang/String;")]
         public static string? ValueOf(Java.Interop.JavaCharArray? data) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "([CII)Ljava/lang/String;")]
         public static string? ValueOf(Java.Interop.JavaCharArray? data, int offset, int count) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/Object;)Ljava/lang/String;")]
         public static string? ValueOf(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Z)Ljava/lang/String;")]
         public static string? ValueOf(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(C)Ljava/lang/String;")]
         public static string? ValueOf(char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(D)Ljava/lang/String;")]
         public static string? ValueOf(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(I)Ljava/lang/String;")]
         public static string? ValueOf(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(J)Ljava/lang/String;")]
         public static string? ValueOf(long l) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(F)Ljava/lang/String;")]
         public static string? ValueOf(float f) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/StringBuffer", GenerateJavaPeer=false)]
@@ -3667,62 +4774,113 @@ public StringBuffer(string? str) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("append", "([C)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Interop.JavaCharArray? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "([CII)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Interop.JavaCharArray? str, int offset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Lang.ICharSequence? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;II)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Lang.ICharSequence? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/Object;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/StringBuffer;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(Java.Lang.StringBuffer? sb) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Z)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(C)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(D)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(I)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(J)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(long lng) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(F)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/String;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Append(string? str) { throw null; }
         public Java.Lang.StringBuffer? Append(string? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("appendCodePoint", "(I)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? AppendCodePoint(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("capacity", "()I")]
         public int Capacity() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("charAt", "(I)C")]
         public char CharAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "(I)I")]
         public int CodePointAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "(I)I")]
         public int CodePointBefore(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointCount", "(II)I")]
         public int CodePointCount(int beginIndex, int endIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/StringBuffer;)I")]
         public int CompareTo(Java.Lang.StringBuffer? another) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("delete", "(II)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Delete(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("deleteCharAt", "(I)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? DeleteCharAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ensureCapacity", "(I)V")]
         public void EnsureCapacity(int minimumCapacity) { }
+        [Java.Interop.JniMethodSignatureAttribute("getChars", "(II[CI)V")]
         public void GetChars(int srcBegin, int srcEnd, Java.Interop.JavaCharArray? dst, int dstBegin) { }
         public System.Collections.Generic.IEnumerator<char> GetEnumerator() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;)I")]
         public int IndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;I)I")]
         public int IndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(I[C)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, Java.Interop.JavaCharArray? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(I[CII)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int index, Java.Interop.JavaCharArray? str, int offset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/CharSequence;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int dstOffset, Java.Lang.ICharSequence? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/CharSequence;II)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int dstOffset, Java.Lang.ICharSequence? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/Object;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IZ)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IC)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ID)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(II)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IJ)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, long l) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IF)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/String;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Insert(int offset, string? str) { throw null; }
         public Java.Lang.StringBuffer? Insert(int dstOffset, string? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;)I")]
         public int LastIndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;I)I")]
         public int LastIndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()I")]
         public int Length() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("offsetByCodePoints", "(II)I")]
         public int OffsetByCodePoints(int index, int codePointOffset) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replace", "(IILjava/lang/String;)Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Replace(int start, int end, string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverse", "()Ljava/lang/StringBuffer;")]
         public Java.Lang.StringBuffer? Reverse() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setCharAt", "(IC)V")]
         public void SetCharAt(int index, char ch) { }
+        [Java.Interop.JniMethodSignatureAttribute("setLength", "(I)V")]
         public void SetLength(int newLength) { }
         public string? SubSequence(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subSequence", "(II)Ljava/lang/CharSequence;")]
         public Java.Lang.ICharSequence? SubSequenceFormatted(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(I)Ljava/lang/String;")]
         public string? Substring(int start) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(II)Ljava/lang/String;")]
         public string? Substring(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         public override string? ToString() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("trimToSize", "()V")]
         public void TrimToSize() { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/StringBuilder", GenerateJavaPeer=false)]
@@ -3735,62 +4893,113 @@ public StringBuilder(string? str) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("append", "([C)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Interop.JavaCharArray? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "([CII)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Interop.JavaCharArray? str, int offset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Lang.ICharSequence? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/CharSequence;II)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Lang.ICharSequence? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/Object;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/StringBuffer;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(Java.Lang.StringBuffer? sb) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Z)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(C)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(D)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(I)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(J)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(long lng) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(F)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("append", "(Ljava/lang/String;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Append(string? str) { throw null; }
         public Java.Lang.StringBuilder? Append(string? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("appendCodePoint", "(I)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? AppendCodePoint(int codePoint) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("capacity", "()I")]
         public int Capacity() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("charAt", "(I)C")]
         public char CharAt(int p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointAt", "(I)I")]
         public int CodePointAt(int p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointBefore", "(I)I")]
         public int CodePointBefore(int p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("codePointCount", "(II)I")]
         public int CodePointCount(int p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/StringBuilder;)I")]
         public int CompareTo(Java.Lang.StringBuilder? another) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("delete", "(II)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Delete(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("deleteCharAt", "(I)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? DeleteCharAt(int index) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("ensureCapacity", "(I)V")]
         public void EnsureCapacity(int p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("getChars", "(II[CI)V")]
         public void GetChars(int p0, int p1, Java.Interop.JavaCharArray? p2, int p3) { }
         public System.Collections.Generic.IEnumerator<char> GetEnumerator() { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
         System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;)I")]
         public int IndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("indexOf", "(Ljava/lang/String;I)I")]
         public int IndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(I[C)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, Java.Interop.JavaCharArray? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(I[CII)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int index, Java.Interop.JavaCharArray? str, int offset, int len) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/CharSequence;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int dstOffset, Java.Lang.ICharSequence? s) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/CharSequence;II)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int dstOffset, Java.Lang.ICharSequence? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/Object;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IZ)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IC)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, char c) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ID)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, double d) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(II)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, int i) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IJ)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, long l) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(IF)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, float f) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insert", "(ILjava/lang/String;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Insert(int offset, string? str) { throw null; }
         public Java.Lang.StringBuilder? Insert(int dstOffset, string? s, int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;)I")]
         public int LastIndexOf(string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastIndexOf", "(Ljava/lang/String;I)I")]
         public int LastIndexOf(string? str, int fromIndex) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("length", "()I")]
         public int Length() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("offsetByCodePoints", "(II)I")]
         public int OffsetByCodePoints(int p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("replace", "(IILjava/lang/String;)Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Replace(int start, int end, string? str) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reverse", "()Ljava/lang/StringBuilder;")]
         public Java.Lang.StringBuilder? Reverse() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setCharAt", "(IC)V")]
         public void SetCharAt(int p0, char p1) { }
+        [Java.Interop.JniMethodSignatureAttribute("setLength", "(I)V")]
         public void SetLength(int p0) { }
         public string? SubSequence(int p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("subSequence", "(II)Ljava/lang/CharSequence;")]
         public Java.Lang.ICharSequence? SubSequenceFormatted(int p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(I)Ljava/lang/String;")]
         public string? Substring(int p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("substring", "(II)Ljava/lang/String;")]
         public string? Substring(int p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         public override string? ToString() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("trimToSize", "()V")]
         public void TrimToSize() { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/StringIndexOutOfBoundsException", GenerateJavaPeer=false)]
@@ -3815,25 +5024,45 @@ internal System() { }
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.IO.PrintStream? Out { get { throw null; } }
         public static Java.Lang.SecurityManager? SecurityManager { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("arraycopy", "(Ljava/lang/Object;ILjava/lang/Object;II)V")]
         public static void Arraycopy(Java.Lang.Object? p0, int p1, Java.Lang.Object? p2, int p3, int p4) { }
+        [Java.Interop.JniMethodSignatureAttribute("clearProperty", "(Ljava/lang/String;)Ljava/lang/String;")]
         public static string? ClearProperty(string? key) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("console", "()Ljava/io/Console;")]
         public static Java.IO.Console? Console() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("currentTimeMillis", "()J")]
         public static long CurrentTimeMillis() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exit", "(I)V")]
         public static void Exit(int status) { }
+        [Java.Interop.JniMethodSignatureAttribute("gc", "()V")]
         public static void Gc() { }
+        [Java.Interop.JniMethodSignatureAttribute("getenv", "(Ljava/lang/String;)Ljava/lang/String;")]
         public static string? Getenv(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getProperty", "(Ljava/lang/String;)Ljava/lang/String;")]
         public static string? GetProperty(string? key) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getProperty", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;")]
         public static string? GetProperty(string? key, string? def) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("identityHashCode", "(Ljava/lang/Object;)I")]
         public static int IdentityHashCode(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lineSeparator", "()Ljava/lang/String;")]
         public static string? LineSeparator() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("load", "(Ljava/lang/String;)V")]
         public static void Load(string? filename) { }
+        [Java.Interop.JniMethodSignatureAttribute("loadLibrary", "(Ljava/lang/String;)V")]
         public static void LoadLibrary(string? libname) { }
+        [Java.Interop.JniMethodSignatureAttribute("mapLibraryName", "(Ljava/lang/String;)Ljava/lang/String;")]
         public static string? MapLibraryName(string? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nanoTime", "()J")]
         public static long NanoTime() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("runFinalization", "()V")]
         public static void RunFinalization() { }
+        [Java.Interop.JniMethodSignatureAttribute("setErr", "(Ljava/io/PrintStream;)V")]
         public static void SetErr(Java.IO.PrintStream? err) { }
+        [Java.Interop.JniMethodSignatureAttribute("setIn", "(Ljava/io/InputStream;)V")]
         public static void SetIn(Java.IO.InputStream? @in) { }
+        [Java.Interop.JniMethodSignatureAttribute("setOut", "(Ljava/io/PrintStream;)V")]
         public static void SetOut(Java.IO.PrintStream? @out) { }
+        [Java.Interop.JniMethodSignatureAttribute("setProperty", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;")]
         public static string? SetProperty(string? key, string? value) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/System$LoggerFinder", GenerateJavaPeer=false)]
         public abstract partial class LoggerFinder : Java.Lang.Object
@@ -3843,6 +5072,7 @@ protected LoggerFinder(ref Java.Interop.JniObjectReference reference, Java.Inter
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("getLoggerFinder", "()Ljava/lang/System$LoggerFinder;")]
             public static Java.Lang.System.LoggerFinder? GetLoggerFinder() { throw null; }
         }
     }
@@ -3875,36 +5105,60 @@ public Thread(string? name) { }
         public int Priority { get { throw null; } set { } }
         public Java.Lang.ThreadGroup? ThreadGroup { get { throw null; } }
         public virtual Java.Lang.Thread.IUncaughtExceptionHandler? UncaughtExceptionHandler { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("activeCount", "()I")]
         public static int ActiveCount() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("checkAccess", "()V")]
         public void CheckAccess() { }
+        [Java.Interop.JniMethodSignatureAttribute("countStackFrames", "()I")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual int CountStackFrames() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("currentThread", "()Ljava/lang/Thread;")]
         public static Java.Lang.Thread? CurrentThread() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("dumpStack", "()V")]
         public static void DumpStack() { }
+        [Java.Interop.JniMethodSignatureAttribute("enumerate", "([Ljava/lang/Thread;)I")]
         public static int Enumerate(Java.Interop.JavaObjectArray<Java.Lang.Thread>? tarray) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getStackTrace", "()[Ljava/lang/StackTraceElement;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.StackTraceElement>? GetStackTrace() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getState", "()Ljava/lang/Thread$State;")]
         public virtual Java.Lang.Thread.State? GetState() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("holdsLock", "(Ljava/lang/Object;)Z")]
         public static bool HoldsLock(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("interrupt", "()V")]
         public virtual void Interrupt() { }
+        [Java.Interop.JniMethodSignatureAttribute("interrupted", "()Z")]
         public static bool Interrupted() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("join", "()V")]
         public void Join() { }
+        [Java.Interop.JniMethodSignatureAttribute("join", "(J)V")]
         public void Join(long millis) { }
+        [Java.Interop.JniMethodSignatureAttribute("join", "(JI)V")]
         public void Join(long millis, int nanos) { }
+        [Java.Interop.JniMethodSignatureAttribute("onSpinWait", "()V")]
         public static void OnSpinWait() { }
+        [Java.Interop.JniMethodSignatureAttribute("resume", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Resume() { }
+        [Java.Interop.JniMethodSignatureAttribute("run", "()V")]
         public virtual void Run() { }
+        [Java.Interop.JniMethodSignatureAttribute("sleep", "(J)V")]
         public static void Sleep(long p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("sleep", "(JI)V")]
         public static void Sleep(long millis, int nanos) { }
+        [Java.Interop.JniMethodSignatureAttribute("start", "()V")]
         public virtual void Start() { }
+        [Java.Interop.JniMethodSignatureAttribute("stop", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Stop() { }
+        [Java.Interop.JniMethodSignatureAttribute("suspend", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Suspend() { }
+        [Java.Interop.JniMethodSignatureAttribute("yield", "()V")]
         public static void Yield() { }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Thread$UncaughtExceptionHandler", GenerateJavaPeer=false)]
         public partial interface IUncaughtExceptionHandler : Java.Interop.IJavaPeerable, System.IDisposable
         {
+            [Java.Interop.JniMethodSignatureAttribute("uncaughtException", "(Ljava/lang/Thread;Ljava/lang/Throwable;)V")]
             void UncaughtException(Java.Lang.Thread? p0, Java.Lang.Throwable? p1);
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/Thread$State", GenerateJavaPeer=false)]
@@ -3920,7 +5174,9 @@ public sealed partial class State : Java.Lang.Enum
             public static Java.Lang.Thread.State Terminated { get { throw null; } }
             public static Java.Lang.Thread.State TimedWaiting { get { throw null; } }
             public static Java.Lang.Thread.State Waiting { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/Thread$State;")]
             public static Java.Lang.Thread.State ValueOf(string name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/Thread$State;")]
             public static Java.Interop.JavaObjectArray<Java.Lang.Thread.State>? Values() { throw null; }
         }
     }
@@ -3947,25 +5203,41 @@ public ThreadGroup(string? name) { }
         public int MaxPriority { get { throw null; } set { } }
         public string? Name { get { throw null; } }
         public Java.Lang.ThreadGroup? Parent { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("activeCount", "()I")]
         public virtual int ActiveCount() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("activeGroupCount", "()I")]
         public virtual int ActiveGroupCount() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("allowThreadSuspension", "(Z)Z")]
         [System.ObsoleteAttribute("deprecated")]
         public virtual bool AllowThreadSuspension(bool b) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("checkAccess", "()V")]
         public void CheckAccess() { }
+        [Java.Interop.JniMethodSignatureAttribute("destroy", "()V")]
         public void Destroy() { }
+        [Java.Interop.JniMethodSignatureAttribute("enumerate", "([Ljava/lang/ThreadGroup;)I")]
         public virtual int Enumerate(Java.Interop.JavaObjectArray<Java.Lang.ThreadGroup>? list) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("enumerate", "([Ljava/lang/ThreadGroup;Z)I")]
         public virtual int Enumerate(Java.Interop.JavaObjectArray<Java.Lang.ThreadGroup>? list, bool recurse) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("enumerate", "([Ljava/lang/Thread;)I")]
         public virtual int Enumerate(Java.Interop.JavaObjectArray<Java.Lang.Thread>? list) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("enumerate", "([Ljava/lang/Thread;Z)I")]
         public virtual int Enumerate(Java.Interop.JavaObjectArray<Java.Lang.Thread>? list, bool recurse) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("interrupt", "()V")]
         public void Interrupt() { }
+        [Java.Interop.JniMethodSignatureAttribute("list", "()V")]
         public virtual void List() { }
+        [Java.Interop.JniMethodSignatureAttribute("parentOf", "(Ljava/lang/ThreadGroup;)Z")]
         public bool ParentOf(Java.Lang.ThreadGroup? g) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("resume", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Resume() { }
+        [Java.Interop.JniMethodSignatureAttribute("stop", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Stop() { }
+        [Java.Interop.JniMethodSignatureAttribute("suspend", "()V")]
         [System.ObsoleteAttribute("deprecated")]
         public void Suspend() { }
+        [Java.Interop.JniMethodSignatureAttribute("uncaughtException", "(Ljava/lang/Thread;Ljava/lang/Throwable;)V")]
         public virtual void UncaughtException(Java.Lang.Thread? t, Java.Lang.Throwable? e) { }
     }
     [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T"})]
@@ -3977,9 +5249,13 @@ protected ThreadLocal(ref Java.Interop.JniObjectReference reference, Java.Intero
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("get", "()Ljava/lang/Object;")]
         public virtual Java.Lang.Object? Get() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("initialValue", "()Ljava/lang/Object;")]
         protected virtual Java.Lang.Object? InitialValue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remove", "()V")]
         public virtual void Remove() { }
+        [Java.Interop.JniMethodSignatureAttribute("set", "(Ljava/lang/Object;)V")]
         public virtual void Set(Java.Lang.Object? value) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/Throwable", GenerateJavaPeer=false)]
@@ -3994,15 +5270,25 @@ protected Throwable(string? message, Java.Lang.Throwable? cause, bool enableSupp
         public virtual Java.Lang.Throwable? Cause { get { throw null; } }
         public virtual string? LocalizedMessage { get { throw null; } }
         public virtual string? Message { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("addSuppressed", "(Ljava/lang/Throwable;)V")]
         public void AddSuppressed(Java.Lang.Throwable? exception) { }
+        [Java.Interop.JniMethodSignatureAttribute("fillInStackTrace", "()Ljava/lang/Throwable;")]
         public virtual Java.Lang.Throwable? FillInStackTrace() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getStackTrace", "()[Ljava/lang/StackTraceElement;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.StackTraceElement>? GetStackTrace() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getSuppressed", "()[Ljava/lang/Throwable;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Throwable>? GetSuppressed() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("initCause", "(Ljava/lang/Throwable;)Ljava/lang/Throwable;")]
         public virtual Java.Lang.Throwable? InitCause(Java.Lang.Throwable? cause) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("printStackTrace", "()V")]
         public virtual void PrintStackTrace() { }
+        [Java.Interop.JniMethodSignatureAttribute("printStackTrace", "(Ljava/io/PrintStream;)V")]
         public virtual void PrintStackTrace(Java.IO.PrintStream? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("printStackTrace", "(Ljava/io/PrintWriter;)V")]
         public virtual void PrintStackTrace(Java.IO.PrintWriter? s) { }
+        [Java.Interop.JniMethodSignatureAttribute("setStackTrace", "([Ljava/lang/StackTraceElement;)V")]
         public virtual void SetStackTrace(Java.Interop.JavaObjectArray<Java.Lang.StackTraceElement>? stackTrace) { }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         public override string? ToString() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/TypeNotPresentException", GenerateJavaPeer=false)]
@@ -4013,6 +5299,7 @@ public TypeNotPresentException(string? typeName, Java.Lang.Throwable? cause) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("typeName", "()Ljava/lang/String;")]
         public virtual string? TypeName() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/UnknownError", GenerateJavaPeer=false)]
@@ -4110,7 +5397,9 @@ public AnnotationTypeMismatchException(Java.Lang.Reflect.Method? element, string
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("element", "()Ljava/lang/reflect/Method;")]
         public virtual Java.Lang.Reflect.Method? Element() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("foundType", "()Ljava/lang/String;")]
         public virtual string? FoundType() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/ElementType", GenerateJavaPeer=false)]
@@ -4131,15 +5420,21 @@ public sealed partial class ElementType : Java.Lang.Enum
         public static Java.Lang.Annotation.ElementType? Type { get { throw null; } }
         public static Java.Lang.Annotation.ElementType? TypeParameter { get { throw null; } }
         public static Java.Lang.Annotation.ElementType? TypeUse { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/annotation/ElementType;")]
         public static Java.Lang.Annotation.ElementType? ValueOf(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/annotation/ElementType;")]
         public static Java.Interop.JavaObjectArray<Java.Lang.Annotation.ElementType>? Values() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/Annotation", GenerateJavaPeer=false)]
     public partial interface IAnnotation : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("annotationType", "()Ljava/lang/Class;")]
         Java.Lang.Class? AnnotationType();
+        [Java.Interop.JniMethodSignatureAttribute("equals", "(Ljava/lang/Object;)Z")]
         bool Equals(Java.Lang.Object? p0);
+        [Java.Interop.JniMethodSignatureAttribute("hashCode", "()I")]
         int GetHashCode();
+        [Java.Interop.JniMethodSignatureAttribute("toString", "()Ljava/lang/String;")]
         string? ToString();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/Documented", GenerateJavaPeer=false)]
@@ -4162,22 +5457,27 @@ public IncompleteAnnotationException(Java.Lang.Class? annotationType, string? el
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("annotationType", "()Ljava/lang/Class;")]
         public virtual Java.Lang.Class? AnnotationType() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("elementName", "()Ljava/lang/String;")]
         public virtual string? ElementName() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/Repeatable", GenerateJavaPeer=false)]
     public partial interface IRepeatable : Java.Interop.IJavaPeerable, Java.Lang.Annotation.IAnnotation, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("value", "()Ljava/lang/Class;")]
         Java.Lang.Class? Value();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/Retention", GenerateJavaPeer=false)]
     public partial interface IRetention : Java.Interop.IJavaPeerable, Java.Lang.Annotation.IAnnotation, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("value", "()Ljava/lang/annotation/RetentionPolicy;")]
         Java.Lang.Annotation.RetentionPolicy? Value();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/Target", GenerateJavaPeer=false)]
     public partial interface ITarget : Java.Interop.IJavaPeerable, Java.Lang.Annotation.IAnnotation, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("value", "()[Ljava/lang/annotation/ElementType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Annotation.ElementType>? Value();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/annotation/RetentionPolicy", GenerateJavaPeer=false)]
@@ -4189,7 +5489,9 @@ public sealed partial class RetentionPolicy : Java.Lang.Enum
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public static Java.Lang.Annotation.RetentionPolicy? Runtime { get { throw null; } }
         public static Java.Lang.Annotation.RetentionPolicy? Source { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/annotation/RetentionPolicy;")]
         public static Java.Lang.Annotation.RetentionPolicy? ValueOf(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/annotation/RetentionPolicy;")]
         public static Java.Interop.JavaObjectArray<Java.Lang.Annotation.RetentionPolicy>? Values() { throw null; }
     }
 }
@@ -4202,8 +5504,9 @@ protected CallSite(ref Java.Interop.JniObjectReference reference, Java.Interop.J
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
-        public abstract Java.Lang.Invoke.MethodHandle? Target { get; set; }
+        public abstract Java.Lang.Invoke.MethodHandle? Target { [Java.Interop.JniMethodSignatureAttribute("getTarget", "()Ljava/lang/invoke/MethodHandle;")] get; [Java.Interop.JniMethodSignatureAttribute("setTarget", "(Ljava/lang/invoke/MethodHandle;)V")] set; }
         public abstract Java.Lang.Invoke.MethodHandle? DynamicInvoker();
+        [Java.Interop.JniMethodSignatureAttribute("type", "()Ljava/lang/invoke/MethodType;")]
         public virtual Java.Lang.Invoke.MethodType? Type() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/ConstantBootstraps", GenerateJavaPeer=false)]
@@ -4213,15 +5516,24 @@ public ConstantBootstraps() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("arrayVarHandle", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
         public static Java.Lang.Invoke.VarHandle? ArrayVarHandle(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type, Java.Lang.Class? arrayClass) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "E extends java.lang.Enum<E>"})]
+        [Java.Interop.JniMethodSignatureAttribute("enumConstant", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Enum;")]
         public static Java.Lang.Object? EnumConstant(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fieldVarHandle", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
         public static Java.Lang.Invoke.VarHandle? FieldVarHandle(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type, Java.Lang.Class? declaringClass, Java.Lang.Class? fieldType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getStaticFinal", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;")]
         public static Java.Lang.Object? GetStaticFinal(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getStaticFinal", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Object;")]
         public static Java.Lang.Object? GetStaticFinal(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type, Java.Lang.Class? declaringClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invoke", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;[Ljava/lang/Object;)Ljava/lang/Object;")]
         public static Java.Lang.Object? Invoke(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type, Java.Lang.Invoke.MethodHandle? handle, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("nullConstant", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;")]
         public static Java.Lang.Object? NullConstant(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("primitiveClass", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Class;")]
         public static Java.Lang.Class? PrimitiveClass(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("staticFieldVarHandle", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
         public static Java.Lang.Invoke.VarHandle? StaticFieldVarHandle(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Class? type, Java.Lang.Class? declaringClass, Java.Lang.Class? fieldType) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/ConstantCallSite", GenerateJavaPeer=false)]
@@ -4234,6 +5546,7 @@ public partial class ConstantCallSite : Java.Lang.Invoke.CallSite
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public override Java.Lang.Invoke.MethodHandle? Target { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("dynamicInvoker", "()Ljava/lang/invoke/MethodHandle;")]
         public sealed override Java.Lang.Invoke.MethodHandle? DynamicInvoker() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/LambdaConversionException", GenerateJavaPeer=false)]
@@ -4259,7 +5572,9 @@ internal LambdaMetafactory() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("altMetafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;")]
         public static Java.Lang.Invoke.CallSite? AltMetafactory(Java.Lang.Invoke.MethodHandles.Lookup? caller, string? invokedName, Java.Lang.Invoke.MethodType? invokedType, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("metafactory", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;")]
         public static Java.Lang.Invoke.CallSite? Metafactory(Java.Lang.Invoke.MethodHandles.Lookup? caller, string? invokedName, Java.Lang.Invoke.MethodType? invokedType, Java.Lang.Invoke.MethodType? samMethodType, Java.Lang.Invoke.MethodHandle? implMethod, Java.Lang.Invoke.MethodType? instantiatedMethodType) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/MethodHandle", GenerateJavaPeer=false)]
@@ -4270,18 +5585,31 @@ protected MethodHandle(ref Java.Interop.JniObjectReference reference, Java.Inter
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("asCollector", "(Ljava/lang/Class;I)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsCollector(Java.Lang.Class? arrayType, int arrayLength) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asCollector", "(ILjava/lang/Class;I)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsCollector(int collectArgPos, Java.Lang.Class? arrayType, int arrayLength) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asFixedArity", "()Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsFixedArity() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asSpreader", "(Ljava/lang/Class;I)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsSpreader(Java.Lang.Class? arrayType, int arrayLength) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asSpreader", "(ILjava/lang/Class;I)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsSpreader(int spreadArgPos, Java.Lang.Class? arrayType, int arrayLength) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asType", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsType(Java.Lang.Invoke.MethodType? newType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("asVarargsCollector", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? AsVarargsCollector(Java.Lang.Class? arrayType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("bindTo", "(Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? BindTo(Java.Lang.Object? x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invoke", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? Invoke(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invokeExact", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? InvokeExact(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invokeWithArguments", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public virtual Java.Lang.Object? InvokeWithArguments(params Java.Lang.Object[]? arguments) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("type", "()Ljava/lang/invoke/MethodType;")]
         public virtual Java.Lang.Invoke.MethodType? Type() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("withVarargs", "(Z)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? WithVarargs(bool makeVarargs) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/MethodHandleProxies", GenerateJavaPeer=false)]
@@ -4292,9 +5620,13 @@ protected MethodHandleProxies(ref Java.Interop.JniObjectReference reference, Jav
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T"})]
+        [Java.Interop.JniMethodSignatureAttribute("asInterfaceInstance", "(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;)Ljava/lang/Object;")]
         public static Java.Lang.Object? AsInterfaceInstance(Java.Lang.Class? intfc, Java.Lang.Invoke.MethodHandle? target) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isWrapperInstance", "(Ljava/lang/Object;)Z")]
         public static bool IsWrapperInstance(Java.Lang.Object? x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("wrapperInstanceTarget", "(Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? WrapperInstanceTarget(Java.Lang.Object? x) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("wrapperInstanceType", "(Ljava/lang/Object;)Ljava/lang/Class;")]
         public static Java.Lang.Class? WrapperInstanceType(Java.Lang.Object? x) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/MethodHandles", GenerateJavaPeer=false)]
@@ -4304,43 +5636,80 @@ protected MethodHandles(ref Java.Interop.JniObjectReference reference, Java.Inte
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("arrayConstructor", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ArrayConstructor(Java.Lang.Class? arrayClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("arrayElementGetter", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ArrayElementGetter(Java.Lang.Class? arrayClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("arrayElementSetter", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ArrayElementSetter(Java.Lang.Class? arrayClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("arrayElementVarHandle", "(Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
         public static Java.Lang.Invoke.VarHandle? ArrayElementVarHandle(Java.Lang.Class? arrayClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("arrayLength", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ArrayLength(Java.Lang.Class? arrayClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("catchException", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? CatchException(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Class? exType, Java.Lang.Invoke.MethodHandle? handler) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("collectArguments", "(Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? CollectArguments(Java.Lang.Invoke.MethodHandle? target, int pos, Java.Lang.Invoke.MethodHandle? filter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("constant", "(Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Constant(Java.Lang.Class? type, Java.Lang.Object? value) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("countedLoop", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? CountedLoop(Java.Lang.Invoke.MethodHandle? iterations, Java.Lang.Invoke.MethodHandle? init, Java.Lang.Invoke.MethodHandle? body) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("countedLoop", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? CountedLoop(Java.Lang.Invoke.MethodHandle? start, Java.Lang.Invoke.MethodHandle? end, Java.Lang.Invoke.MethodHandle? init, Java.Lang.Invoke.MethodHandle? body) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("doWhileLoop", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? DoWhileLoop(Java.Lang.Invoke.MethodHandle? init, Java.Lang.Invoke.MethodHandle? body, Java.Lang.Invoke.MethodHandle? pred) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("dropArguments", "(Ljava/lang/invoke/MethodHandle;I[Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? DropArguments(Java.Lang.Invoke.MethodHandle? target, int pos, params Java.Lang.Class[]? valueTypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("empty", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Empty(Java.Lang.Invoke.MethodType? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("exactInvoker", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ExactInvoker(Java.Lang.Invoke.MethodType? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("explicitCastArguments", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ExplicitCastArguments(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodType? newType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("filterArguments", "(Ljava/lang/invoke/MethodHandle;I[Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? FilterArguments(Java.Lang.Invoke.MethodHandle? target, int pos, params Java.Lang.Invoke.MethodHandle[]? filters) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("filterReturnValue", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? FilterReturnValue(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodHandle? filter) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("foldArguments", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? FoldArguments(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodHandle? combiner) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("foldArguments", "(Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? FoldArguments(Java.Lang.Invoke.MethodHandle? target, int pos, Java.Lang.Invoke.MethodHandle? combiner) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("guardWithTest", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? GuardWithTest(Java.Lang.Invoke.MethodHandle? test, Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodHandle? fallback) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("identity", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Identity(Java.Lang.Class? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insertArguments", "(Ljava/lang/invoke/MethodHandle;I[Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? InsertArguments(Java.Lang.Invoke.MethodHandle? target, int pos, params Java.Lang.Object[]? values) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lookup", "()Ljava/lang/invoke/MethodHandles$Lookup;")]
         public static Java.Lang.Invoke.MethodHandles.Lookup? InvokeLookup() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invoker", "(Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Invoker(Java.Lang.Invoke.MethodType? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("iteratedLoop", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? IteratedLoop(Java.Lang.Invoke.MethodHandle? iterator, Java.Lang.Invoke.MethodHandle? init, Java.Lang.Invoke.MethodHandle? body) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("loop", "([[Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Loop(params Java.Interop.JavaObjectArray<Java.Lang.Invoke.MethodHandle>[]? clauses) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("permuteArguments", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodType;[I)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? PermuteArguments(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodType? newType, params int[]? reorder) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("privateLookupIn", "(Ljava/lang/Class;Ljava/lang/invoke/MethodHandles$Lookup;)Ljava/lang/invoke/MethodHandles$Lookup;")]
         public static Java.Lang.Invoke.MethodHandles.Lookup? PrivateLookupIn(Java.Lang.Class? targetClass, Java.Lang.Invoke.MethodHandles.Lookup? lookup) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("publicLookup", "()Ljava/lang/invoke/MethodHandles$Lookup;")]
         public static Java.Lang.Invoke.MethodHandles.Lookup? PublicLookup() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.reflect.Member"})]
+        [Java.Interop.JniMethodSignatureAttribute("reflectAs", "(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;)Ljava/lang/reflect/Member;")]
         public static Java.Lang.Object? ReflectAs(Java.Lang.Class? expected, Java.Lang.Invoke.MethodHandle? target) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("spreadInvoker", "(Ljava/lang/invoke/MethodType;I)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? SpreadInvoker(Java.Lang.Invoke.MethodType? type, int leadingArgCount) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("throwException", "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? ThrowException(Java.Lang.Class? returnType, Java.Lang.Class? exType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("tryFinally", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? TryFinally(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodHandle? cleanup) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("varHandleExactInvoker", "(Ljava/lang/invoke/VarHandle$AccessMode;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? VarHandleExactInvoker(Java.Lang.Invoke.VarHandle.AccessMode? accessMode, Java.Lang.Invoke.MethodType? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("varHandleInvoker", "(Ljava/lang/invoke/VarHandle$AccessMode;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? VarHandleInvoker(Java.Lang.Invoke.VarHandle.AccessMode? accessMode, Java.Lang.Invoke.MethodType? type) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("whileLoop", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? WhileLoop(Java.Lang.Invoke.MethodHandle? init, Java.Lang.Invoke.MethodHandle? pred, Java.Lang.Invoke.MethodHandle? body) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("zero", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
         public static Java.Lang.Invoke.MethodHandle? Zero(Java.Lang.Class? type) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/MethodHandles$Lookup", GenerateJavaPeer=false)]
         public sealed partial class Lookup : Java.Lang.Object
@@ -4356,28 +5725,51 @@ internal Lookup() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("accessClass", "(Ljava/lang/Class;)Ljava/lang/Class;")]
             public Java.Lang.Class? AccessClass(Java.Lang.Class? targetClass) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("bind", "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? Bind(Java.Lang.Object? receiver, string? name, Java.Lang.Invoke.MethodType? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("defineClass", "([B)Ljava/lang/Class;")]
             public Java.Lang.Class? DefineClass(Java.Interop.JavaSByteArray? bytes) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("dropLookupMode", "(I)Ljava/lang/invoke/MethodHandles$Lookup;")]
             public Java.Lang.Invoke.MethodHandles.Lookup? DropLookupMode(int modeToDrop) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findClass", "(Ljava/lang/String;)Ljava/lang/Class;")]
             public Java.Lang.Class? FindClass(string? targetName) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findConstructor", "(Ljava/lang/Class;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindConstructor(Java.Lang.Class? refc, Java.Lang.Invoke.MethodType? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findGetter", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindGetter(Java.Lang.Class? refc, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findSetter", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindSetter(Java.Lang.Class? refc, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findSpecial", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindSpecial(Java.Lang.Class? refc, string? name, Java.Lang.Invoke.MethodType? type, Java.Lang.Class? specialCaller) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findStatic", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindStatic(Java.Lang.Class? refc, string? name, Java.Lang.Invoke.MethodType? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findStaticGetter", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindStaticGetter(Java.Lang.Class? refc, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findStaticSetter", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindStaticSetter(Java.Lang.Class? refc, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findStaticVarHandle", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
             public Java.Lang.Invoke.VarHandle? FindStaticVarHandle(Java.Lang.Class? decl, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findVarHandle", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/invoke/VarHandle;")]
             public Java.Lang.Invoke.VarHandle? FindVarHandle(Java.Lang.Class? recv, string? name, Java.Lang.Class? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("findVirtual", "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? FindVirtual(Java.Lang.Class? refc, string? name, Java.Lang.Invoke.MethodType? type) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("in", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodHandles$Lookup;")]
             public Java.Lang.Invoke.MethodHandles.Lookup? In(Java.Lang.Class? requestedLookupClass) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("lookupClass", "()Ljava/lang/Class;")]
             public Java.Lang.Class? LookupClass() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflect", "(Ljava/lang/reflect/Method;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? Unreflect(Java.Lang.Reflect.Method? m) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflectConstructor", "(Ljava/lang/reflect/Constructor;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? UnreflectConstructor(Java.Lang.Reflect.Constructor? c) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflectGetter", "(Ljava/lang/reflect/Field;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? UnreflectGetter(Java.Lang.Reflect.Field? f) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflectSetter", "(Ljava/lang/reflect/Field;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? UnreflectSetter(Java.Lang.Reflect.Field? f) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflectSpecial", "(Ljava/lang/reflect/Method;Ljava/lang/Class;)Ljava/lang/invoke/MethodHandle;")]
             public Java.Lang.Invoke.MethodHandle? UnreflectSpecial(Java.Lang.Reflect.Method? m, Java.Lang.Class? specialCaller) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("unreflectVarHandle", "(Ljava/lang/reflect/Field;)Ljava/lang/invoke/VarHandle;")]
             public Java.Lang.Invoke.VarHandle? UnreflectVarHandle(Java.Lang.Reflect.Field? f) { throw null; }
         }
     }
@@ -4390,28 +5782,51 @@ internal MethodType() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("appendParameterTypes", "([Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? AppendParameterTypes(params Java.Lang.Class[]? ptypesToInsert) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("changeParameterType", "(ILjava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? ChangeParameterType(int num, Java.Lang.Class? nptype) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("changeReturnType", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? ChangeReturnType(Java.Lang.Class? nrtype) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("dropParameterTypes", "(II)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? DropParameterTypes(int start, int end) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("erase", "()Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? Erase() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fromMethodDescriptorString", "(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? FromMethodDescriptorString(string? descriptor, Java.Lang.ClassLoader? loader) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("generic", "()Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? Generic() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("genericMethodType", "(I)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? GenericMethodType(int objectArgCount) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("genericMethodType", "(IZ)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? GenericMethodType(int objectArgCount, bool finalArray) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("insertParameterTypes", "(I[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? InsertParameterTypes(int num, params Java.Lang.Class[]? ptypesToInsert) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodType", "(Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? InvokeMethodType(Java.Lang.Class? rtype) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodType", "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? InvokeMethodType(Java.Lang.Class? rtype, Java.Interop.JavaObjectArray<Java.Lang.Class>? ptypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodType", "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? InvokeMethodType(Java.Lang.Class? rtype, Java.Lang.Class? ptype0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodType", "(Ljava/lang/Class;Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? InvokeMethodType(Java.Lang.Class? rtype, Java.Lang.Class? ptype0, params Java.Lang.Class[]? ptypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodType", "(Ljava/lang/Class;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MethodType;")]
         public static Java.Lang.Invoke.MethodType? InvokeMethodType(Java.Lang.Class? rtype, Java.Lang.Invoke.MethodType? ptypes) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("lastParameterType", "()Ljava/lang/Class;")]
         public Java.Lang.Class? LastParameterType() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parameterArray", "()[Ljava/lang/Class;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Class>? ParameterArray() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parameterCount", "()I")]
         public int ParameterCount() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parameterType", "(I)Ljava/lang/Class;")]
         public Java.Lang.Class? ParameterType(int num) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("returnType", "()Ljava/lang/Class;")]
         public Java.Lang.Class? ReturnType() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toMethodDescriptorString", "()Ljava/lang/String;")]
         public string? ToMethodDescriptorString() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("unwrap", "()Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? Unwrap() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("wrap", "()Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? Wrap() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/MutableCallSite", GenerateJavaPeer=false)]
@@ -4424,7 +5839,9 @@ public partial class MutableCallSite : Java.Lang.Invoke.CallSite
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public override Java.Lang.Invoke.MethodHandle? Target { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("dynamicInvoker", "()Ljava/lang/invoke/MethodHandle;")]
         public sealed override Java.Lang.Invoke.MethodHandle? DynamicInvoker() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("syncAll", "([Ljava/lang/invoke/MutableCallSite;)V")]
         public static void SyncAll(Java.Interop.JavaObjectArray<Java.Lang.Invoke.MutableCallSite>? sites) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/SerializedLambda", GenerateJavaPeer=false)]
@@ -4444,6 +5861,7 @@ public SerializedLambda(Java.Lang.Class? capturingClass, string? functionalInter
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getCapturedArg", "(I)Ljava/lang/Object;")]
         public Java.Lang.Object? GetCapturedArg(int i) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/StringConcatException", GenerateJavaPeer=false)]
@@ -4463,7 +5881,9 @@ internal StringConcatFactory() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("makeConcat", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;")]
         public static Java.Lang.Invoke.CallSite? MakeConcat(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Invoke.MethodType? concatType) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("makeConcatWithConstants", "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;")]
         public static Java.Lang.Invoke.CallSite? MakeConcatWithConstants(Java.Lang.Invoke.MethodHandles.Lookup? lookup, string? name, Java.Lang.Invoke.MethodType? concatType, string? recipe, params Java.Lang.Object[]? constants) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/SwitchPoint", GenerateJavaPeer=false)]
@@ -4475,7 +5895,9 @@ protected SwitchPoint(ref Java.Interop.JniObjectReference reference, Java.Intero
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("guardWithTest", "(Ljava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;")]
         public virtual Java.Lang.Invoke.MethodHandle? GuardWithTest(Java.Lang.Invoke.MethodHandle? target, Java.Lang.Invoke.MethodHandle? fallback) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invalidateAll", "([Ljava/lang/invoke/SwitchPoint;)V")]
         public static void InvalidateAll(Java.Interop.JavaObjectArray<Java.Lang.Invoke.SwitchPoint>? switchPoints) { }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/VarHandle", GenerateJavaPeer=false)]
@@ -4485,45 +5907,85 @@ protected VarHandle(ref Java.Interop.JniObjectReference reference, Java.Interop.
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("accessModeType", "(Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodType;")]
         public Java.Lang.Invoke.MethodType? AccessModeType(Java.Lang.Invoke.VarHandle.AccessMode? accessMode) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("acquireFence", "()V")]
         public static void AcquireFence() { }
+        [Java.Interop.JniMethodSignatureAttribute("compareAndExchange", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? CompareAndExchange(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareAndExchangeAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? CompareAndExchangeAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareAndExchangeRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? CompareAndExchangeRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("compareAndSet", "([Ljava/lang/Object;)Z")]
         public bool CompareAndSet(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fullFence", "()V")]
         public static void FullFence() { }
+        [Java.Interop.JniMethodSignatureAttribute("get", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? Get(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndAdd", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndAdd(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndAddAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndAddAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndAddRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndAddRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseAnd", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseAnd(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseAndAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseAndAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseAndRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseAndRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseOr", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseOr(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseOrAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseOrAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseOrRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseOrRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseXor", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseXor(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseXorAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseXorAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndBitwiseXorRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndBitwiseXorRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndSet", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndSet(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndSetAcquire", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndSetAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAndSetRelease", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetAndSetRelease(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getOpaque", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetOpaque(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getVolatile", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? GetVolatile(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAccessModeSupported", "(Ljava/lang/invoke/VarHandle$AccessMode;)Z")]
         public bool IsAccessModeSupported(Java.Lang.Invoke.VarHandle.AccessMode? accessMode) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("loadLoadFence", "()V")]
         public static void LoadLoadFence() { }
+        [Java.Interop.JniMethodSignatureAttribute("releaseFence", "()V")]
         public static void ReleaseFence() { }
+        [Java.Interop.JniMethodSignatureAttribute("set", "([Ljava/lang/Object;)V")]
         public void Set(params Java.Lang.Object[]? p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("setOpaque", "([Ljava/lang/Object;)V")]
         public void SetOpaque(params Java.Lang.Object[]? p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("setRelease", "([Ljava/lang/Object;)V")]
         public void SetRelease(params Java.Lang.Object[]? p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("setVolatile", "([Ljava/lang/Object;)V")]
         public void SetVolatile(params Java.Lang.Object[]? p0) { }
+        [Java.Interop.JniMethodSignatureAttribute("storeStoreFence", "()V")]
         public static void StoreStoreFence() { }
+        [Java.Interop.JniMethodSignatureAttribute("toMethodHandle", "(Ljava/lang/invoke/VarHandle$AccessMode;)Ljava/lang/invoke/MethodHandle;")]
         public Java.Lang.Invoke.MethodHandle? ToMethodHandle(Java.Lang.Invoke.VarHandle.AccessMode? accessMode) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("varType", "()Ljava/lang/Class;")]
         public Java.Lang.Class? VarType() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("weakCompareAndSet", "([Ljava/lang/Object;)Z")]
         public bool WeakCompareAndSet(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("weakCompareAndSetAcquire", "([Ljava/lang/Object;)Z")]
         public bool WeakCompareAndSetAcquire(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("weakCompareAndSetPlain", "([Ljava/lang/Object;)Z")]
         public bool WeakCompareAndSetPlain(params Java.Lang.Object[]? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("weakCompareAndSetRelease", "([Ljava/lang/Object;)Z")]
         public bool WeakCompareAndSetRelease(params Java.Lang.Object[]? p0) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/VarHandle$AccessMode", GenerateJavaPeer=false)]
         public sealed partial class AccessMode : Java.Lang.Enum
@@ -4563,9 +6025,13 @@ public sealed partial class AccessMode : Java.Lang.Enum
             public static Java.Lang.Invoke.VarHandle.AccessMode? WeakCompareAndSetAcquire { get { throw null; } }
             public static Java.Lang.Invoke.VarHandle.AccessMode? WeakCompareAndSetPlain { get { throw null; } }
             public static Java.Lang.Invoke.VarHandle.AccessMode? WeakCompareAndSetRelease { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("methodName", "()Ljava/lang/String;")]
             public string? MethodName() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("valueFromMethodName", "(Ljava/lang/String;)Ljava/lang/invoke/VarHandle$AccessMode;")]
             public static Java.Lang.Invoke.VarHandle.AccessMode? ValueFromMethodName(string? methodName) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/invoke/VarHandle$AccessMode;")]
             public static Java.Lang.Invoke.VarHandle.AccessMode? ValueOf(string? name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/invoke/VarHandle$AccessMode;")]
             public static Java.Interop.JavaObjectArray<Java.Lang.Invoke.VarHandle.AccessMode>? Values() { throw null; }
         }
     }
@@ -4579,6 +6045,7 @@ public partial class VolatileCallSite : Java.Lang.Invoke.CallSite
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public override Java.Lang.Invoke.MethodHandle? Target { get { throw null; } set { } }
+        [Java.Interop.JniMethodSignatureAttribute("dynamicInvoker", "()Ljava/lang/invoke/MethodHandle;")]
         public sealed override Java.Lang.Invoke.MethodHandle? DynamicInvoker() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/invoke/WrongMethodTypeException", GenerateJavaPeer=false)]
@@ -4601,6 +6068,7 @@ internal Configuration() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("empty", "()Ljava/lang/module/Configuration;")]
         public static Java.Lang.Modules.Configuration? Empty() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/module/FindException", GenerateJavaPeer=false)]
@@ -4634,13 +6102,20 @@ protected ModuleDescriptor(ref Java.Interop.JniObjectReference reference, Java.I
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor;)I")]
         public virtual int CompareTo(Java.Lang.Modules.ModuleDescriptor? that) { throw null; }
         int Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("name", "()Ljava/lang/String;")]
         public virtual string? Name() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newAutomaticModule", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
         public static Java.Lang.Modules.ModuleDescriptor.Builder? NewAutomaticModule(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newModule", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
         public static Java.Lang.Modules.ModuleDescriptor.Builder? NewModule(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newOpenModule", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
         public static Java.Lang.Modules.ModuleDescriptor.Builder? NewOpenModule(string? name) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("read", "(Ljava/io/InputStream;)Ljava/lang/module/ModuleDescriptor;")]
         public static Java.Lang.Modules.ModuleDescriptor? Read(Java.IO.InputStream? @in) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toNameAndVersion", "()Ljava/lang/String;")]
         public virtual string? ToNameAndVersion() { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Builder", GenerateJavaPeer=false)]
         public sealed partial class Builder : Java.Lang.Object
@@ -4649,17 +6124,29 @@ internal Builder() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("build", "()Ljava/lang/module/ModuleDescriptor;")]
             public Java.Lang.Modules.ModuleDescriptor? Build() { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("exports", "(Ljava/lang/module/ModuleDescriptor$Exports;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Exports(Java.Lang.Modules.ModuleDescriptor.Exports? e) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("exports", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Exports(string? pn) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("mainClass", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? MainClass(string? mc) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("opens", "(Ljava/lang/module/ModuleDescriptor$Opens;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Opens(Java.Lang.Modules.ModuleDescriptor.Opens? obj) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("opens", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Opens(string? pn) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("provides", "(Ljava/lang/module/ModuleDescriptor$Provides;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Provides(Java.Lang.Modules.ModuleDescriptor.Provides? p) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("requires", "(Ljava/lang/module/ModuleDescriptor$Requires;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Requires(Java.Lang.Modules.ModuleDescriptor.Requires? req) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("requires", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Requires(string? mn) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("uses", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Uses(string? service) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("version", "(Ljava/lang/module/ModuleDescriptor$Version;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Version(Java.Lang.Modules.ModuleDescriptor.Version? v) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("version", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Builder;")]
             public Java.Lang.Modules.ModuleDescriptor.Builder? Version(string? vs) { throw null; }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Exports", GenerateJavaPeer=false)]
@@ -4670,8 +6157,10 @@ internal Exports() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor$Exports;)I")]
             public int CompareTo(Java.Lang.Modules.ModuleDescriptor.Exports? that) { throw null; }
             int global::Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("source", "()Ljava/lang/String;")]
             public string? Source() { throw null; }
             [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Exports$Modifier", GenerateJavaPeer=false)]
             public sealed partial class Modifier : Java.Lang.Enum
@@ -4682,7 +6171,9 @@ public sealed partial class Modifier : Java.Lang.Enum
                 public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Exports.Modifier? Mandated { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Exports.Modifier? Synthetic { get { throw null; } }
+                [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Exports$Modifier;")]
                 public static Java.Lang.Modules.ModuleDescriptor.Exports.Modifier? ValueOf(string? name) { throw null; }
+                [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/module/ModuleDescriptor$Exports$Modifier;")]
                 public static Java.Interop.JavaObjectArray<Java.Lang.Modules.ModuleDescriptor.Exports.Modifier>? Values() { throw null; }
             }
         }
@@ -4697,7 +6188,9 @@ public sealed partial class Modifier : Java.Lang.Enum
             public static Java.Lang.Modules.ModuleDescriptor.Modifier? Mandated { get { throw null; } }
             public static Java.Lang.Modules.ModuleDescriptor.Modifier? Open { get { throw null; } }
             public static Java.Lang.Modules.ModuleDescriptor.Modifier? Synthetic { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Modifier;")]
             public static Java.Lang.Modules.ModuleDescriptor.Modifier? ValueOf(string? name) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/module/ModuleDescriptor$Modifier;")]
             public static Java.Interop.JavaObjectArray<Java.Lang.Modules.ModuleDescriptor.Modifier>? Values() { throw null; }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Opens", GenerateJavaPeer=false)]
@@ -4708,8 +6201,10 @@ internal Opens() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor$Opens;)I")]
             public int CompareTo(Java.Lang.Modules.ModuleDescriptor.Opens? that) { throw null; }
             int global::Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("source", "()Ljava/lang/String;")]
             public string? Source() { throw null; }
             [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Opens$Modifier", GenerateJavaPeer=false)]
             public sealed partial class Modifier : Java.Lang.Enum
@@ -4720,7 +6215,9 @@ public sealed partial class Modifier : Java.Lang.Enum
                 public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Opens.Modifier? Mandated { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Opens.Modifier? Synthetic { get { throw null; } }
+                [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Opens$Modifier;")]
                 public static Java.Lang.Modules.ModuleDescriptor.Opens.Modifier? ValueOf(string? name) { throw null; }
+                [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/module/ModuleDescriptor$Opens$Modifier;")]
                 public static Java.Interop.JavaObjectArray<Java.Lang.Modules.ModuleDescriptor.Opens.Modifier>? Values() { throw null; }
             }
         }
@@ -4731,8 +6228,10 @@ internal Provides() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor$Provides;)I")]
             public int CompareTo(Java.Lang.Modules.ModuleDescriptor.Provides? that) { throw null; }
             int global::Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("service", "()Ljava/lang/String;")]
             public string? Service() { throw null; }
         }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Requires", GenerateJavaPeer=false)]
@@ -4742,8 +6241,10 @@ internal Requires() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor$Requires;)I")]
             public int CompareTo(Java.Lang.Modules.ModuleDescriptor.Requires? that) { throw null; }
             int global::Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("name", "()Ljava/lang/String;")]
             public string? Name() { throw null; }
             [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ModuleDescriptor$Requires$Modifier", GenerateJavaPeer=false)]
             public sealed partial class Modifier : Java.Lang.Enum
@@ -4756,7 +6257,9 @@ public sealed partial class Modifier : Java.Lang.Enum
                 public static Java.Lang.Modules.ModuleDescriptor.Requires.Modifier? Static { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Requires.Modifier? Synthetic { get { throw null; } }
                 public static Java.Lang.Modules.ModuleDescriptor.Requires.Modifier? Transitive { get { throw null; } }
+                [Java.Interop.JniMethodSignatureAttribute("valueOf", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Requires$Modifier;")]
                 public static Java.Lang.Modules.ModuleDescriptor.Requires.Modifier? ValueOf(string? name) { throw null; }
+                [Java.Interop.JniMethodSignatureAttribute("values", "()[Ljava/lang/module/ModuleDescriptor$Requires$Modifier;")]
                 public static Java.Interop.JavaObjectArray<Java.Lang.Modules.ModuleDescriptor.Requires.Modifier>? Values() { throw null; }
             }
         }
@@ -4767,8 +6270,10 @@ internal Version() { }
             [System.ComponentModel.EditorBrowsableAttribute(1)]
             [System.Diagnostics.DebuggerBrowsableAttribute(0)]
             public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+            [Java.Interop.JniMethodSignatureAttribute("compareTo", "(Ljava/lang/module/ModuleDescriptor$Version;)I")]
             public int CompareTo(Java.Lang.Modules.ModuleDescriptor.Version? that) { throw null; }
             int global::Java.Lang.IComparable.CompareTo(Java.Lang.Object? p0) { throw null; }
+            [Java.Interop.JniMethodSignatureAttribute("parse", "(Ljava/lang/String;)Ljava/lang/module/ModuleDescriptor$Version;")]
             public static Java.Lang.Modules.ModuleDescriptor.Version? Parse(string? v) { throw null; }
         }
     }
@@ -4779,6 +6284,7 @@ protected ModuleReference(ref Java.Interop.JniObjectReference reference, Java.In
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("descriptor", "()Ljava/lang/module/ModuleDescriptor;")]
         public Java.Lang.Modules.ModuleDescriptor? Descriptor() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/module/ResolutionException", GenerateJavaPeer=false)]
@@ -4800,8 +6306,11 @@ internal ResolvedModule() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("configuration", "()Ljava/lang/module/Configuration;")]
         public Java.Lang.Modules.Configuration? Configuration() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("name", "()Ljava/lang/String;")]
         public string? Name() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reference", "()Ljava/lang/module/ModuleReference;")]
         public Java.Lang.Modules.ModuleReference? Reference() { throw null; }
     }
 }
@@ -4814,11 +6323,14 @@ internal Cleaner() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("create", "()Ljava/lang/ref/Cleaner;")]
         public static Java.Lang.Ref.Cleaner? Create() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("register", "(Ljava/lang/Object;Ljava/lang/Runnable;)Ljava/lang/ref/Cleaner$Cleanable;")]
         public Java.Lang.Ref.Cleaner.ICleanable? Register(Java.Lang.Object? obj, Java.Lang.IRunnable? action) { throw null; }
         [Java.Interop.JniTypeSignatureAttribute("java/lang/ref/Cleaner$Cleanable", GenerateJavaPeer=false)]
         public partial interface ICleanable : Java.Interop.IJavaPeerable, System.IDisposable
         {
+            [Java.Interop.JniMethodSignatureAttribute("clean", "()V")]
             void Clean();
         }
     }
@@ -4841,9 +6353,13 @@ protected Reference(ref Java.Interop.JniObjectReference reference, Java.Interop.
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("clear", "()V")]
         public virtual void Clear() { }
+        [Java.Interop.JniMethodSignatureAttribute("enqueue", "()Z")]
         public virtual bool Enqueue() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("get", "()Ljava/lang/Object;")]
         public virtual Java.Lang.Object? Get() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("reachabilityFence", "(Ljava/lang/Object;)V")]
         public static void ReachabilityFence(Java.Lang.Object? @ref) { }
     }
     [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T"})]
@@ -4855,8 +6371,11 @@ protected ReferenceQueue(ref Java.Interop.JniObjectReference reference, Java.Int
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("poll", "()Ljava/lang/ref/Reference;")]
         public virtual Java.Lang.Ref.Reference? Poll() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remove", "()Ljava/lang/ref/Reference;")]
         public virtual Java.Lang.Ref.Reference? Remove() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("remove", "(J)Ljava/lang/ref/Reference;")]
         public virtual Java.Lang.Ref.Reference? Remove(long timeout) { throw null; }
     }
     [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T"})]
@@ -4893,19 +6412,29 @@ protected AccessibleObject(ref Java.Interop.JniObjectReference reference, Java.I
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("canAccess", "(Ljava/lang/Object;)Z")]
         public bool CanAccess(Java.Lang.Object? obj) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public virtual Java.Lang.Object? GetAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Object>? GetAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public virtual Java.Lang.Object? GetDeclaredAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Object>? GetDeclaredAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAnnotationPresent", "(Ljava/lang/Class;)Z")]
         public virtual bool IsAnnotationPresent(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("setAccessible", "([Ljava/lang/reflect/AccessibleObject;Z)V")]
         public static void SetAccessible(Java.Interop.JavaObjectArray<Java.Lang.Reflect.AccessibleObject>? array, bool flag) { }
+        [Java.Interop.JniMethodSignatureAttribute("trySetAccessible", "()Z")]
         public bool TrySetAccessible() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Array", GenerateJavaPeer=false)]
@@ -4915,26 +6444,47 @@ internal Array() { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("get", "(Ljava/lang/Object;I)Ljava/lang/Object;")]
         public static Java.Lang.Object? Get(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getBoolean", "(Ljava/lang/Object;I)Z")]
         public static bool GetBoolean(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getByte", "(Ljava/lang/Object;I)B")]
         public static sbyte GetByte(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getChar", "(Ljava/lang/Object;I)C")]
         public static char GetChar(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDouble", "(Ljava/lang/Object;I)D")]
         public static double GetDouble(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getFloat", "(Ljava/lang/Object;I)F")]
         public static float GetFloat(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInt", "(Ljava/lang/Object;I)I")]
         public static int GetInt(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLength", "(Ljava/lang/Object;)I")]
         public static int GetLength(Java.Lang.Object? p0) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLong", "(Ljava/lang/Object;I)J")]
         public static long GetLong(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getShort", "(Ljava/lang/Object;I)S")]
         public static short GetShort(Java.Lang.Object? p0, int p1) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newInstance", "(Ljava/lang/Class;I)Ljava/lang/Object;")]
         public static Java.Lang.Object? NewInstance(Java.Lang.Class? componentType, int length) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newInstance", "(Ljava/lang/Class;[I)Ljava/lang/Object;")]
         public static Java.Lang.Object? NewInstance(Java.Lang.Class? componentType, params int[]? dimensions) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("set", "(Ljava/lang/Object;ILjava/lang/Object;)V")]
         public static void Set(Java.Lang.Object? p0, int p1, Java.Lang.Object? p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setBoolean", "(Ljava/lang/Object;IZ)V")]
         public static void SetBoolean(Java.Lang.Object? p0, int p1, bool p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setByte", "(Ljava/lang/Object;IB)V")]
         public static void SetByte(Java.Lang.Object? p0, int p1, sbyte p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setChar", "(Ljava/lang/Object;IC)V")]
         public static void SetChar(Java.Lang.Object? p0, int p1, char p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setDouble", "(Ljava/lang/Object;ID)V")]
         public static void SetDouble(Java.Lang.Object? p0, int p1, double p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setFloat", "(Ljava/lang/Object;IF)V")]
         public static void SetFloat(Java.Lang.Object? p0, int p1, float p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setInt", "(Ljava/lang/Object;II)V")]
         public static void SetInt(Java.Lang.Object? p0, int p1, int p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setLong", "(Ljava/lang/Object;IJ)V")]
         public static void SetLong(Java.Lang.Object? p0, int p1, long p2) { }
+        [Java.Interop.JniMethodSignatureAttribute("setShort", "(Ljava/lang/Object;IS)V")]
         public static void SetShort(Java.Lang.Object? p0, int p1, short p2) { }
     }
     [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T"})]
@@ -4949,11 +6499,17 @@ public sealed partial class Constructor : Java.Lang.Reflect.Executable
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
         public override int Modifiers { get { throw null; } }
         public override string? Name { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getExceptionTypes", "()[Ljava/lang/Class;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Class>? GetExceptionTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getParameterAnnotations", "()[[Ljava/lang/annotation/Annotation;")]
         public override Java.Interop.JavaObjectArray<Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>>? GetParameterAnnotations() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getParameterTypes", "()[Ljava/lang/Class;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Class>? GetParameterTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Reflect.ITypeVariable>? GetTypeParameters() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newInstance", "([Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? NewInstance(params Java.Lang.Object[]? initargs) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toGenericString", "()Ljava/lang/String;")]
         public override string? ToGenericString() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Executable", GenerateJavaPeer=false)]
@@ -4961,22 +6517,27 @@ public abstract partial class Executable : Java.Lang.Reflect.AccessibleObject, J
     {
         protected Executable(ref Java.Interop.JniObjectReference reference, Java.Interop.JniObjectReferenceOptions options) { }
         public virtual Java.Lang.Reflect.IAnnotatedType? AnnotatedReceiverType { get { throw null; } }
-        public abstract Java.Lang.Reflect.IAnnotatedType? AnnotatedReturnType { get; }
-        public abstract Java.Lang.Class? DeclaringClass { get; }
+        public abstract Java.Lang.Reflect.IAnnotatedType? AnnotatedReturnType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedReturnType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
+        public abstract Java.Lang.Class? DeclaringClass { [Java.Interop.JniMethodSignatureAttribute("getDeclaringClass", "()Ljava/lang/Class;")] get; }
         public virtual bool IsSynthetic { get { throw null; } }
         public virtual bool IsVarArgs { get { throw null; } }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
-        public abstract int Modifiers { get; }
-        public abstract string? Name { get; }
+        public abstract int Modifiers { [Java.Interop.JniMethodSignatureAttribute("getModifiers", "()I")] get; }
+        public abstract string? Name { [Java.Interop.JniMethodSignatureAttribute("getName", "()Ljava/lang/String;")] get; }
         public virtual int ParameterCount { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedExceptionTypes", "()[Ljava/lang/reflect/AnnotatedType;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedExceptionTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedParameterTypes", "()[Ljava/lang/reflect/AnnotatedType;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedParameterTypes() { throw null; }
         public abstract Java.Interop.JavaObjectArray<Java.Lang.Class>? GetExceptionTypes();
+        [Java.Interop.JniMethodSignatureAttribute("getGenericExceptionTypes", "()[Ljava/lang/reflect/Type;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetGenericExceptionTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getGenericParameterTypes", "()[Ljava/lang/reflect/Type;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetGenericParameterTypes() { throw null; }
         public abstract Java.Interop.JavaObjectArray<Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>>? GetParameterAnnotations();
+        [Java.Interop.JniMethodSignatureAttribute("getParameters", "()[Ljava/lang/reflect/Parameter;")]
         public virtual Java.Interop.JavaObjectArray<Java.Lang.Reflect.Parameter>? GetParameters() { throw null; }
         public abstract Java.Interop.JavaObjectArray<Java.Lang.Class>? GetParameterTypes();
         public abstract Java.Interop.JavaObjectArray<Java.Lang.Reflect.ITypeVariable>? GetTypeParameters();
@@ -5002,24 +6563,43 @@ internal Field() { }
         public int Modifiers { get { throw null; } }
         public string? Name { get { throw null; } }
         public Java.Lang.Class? Type { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("get", "(Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? Get(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getBoolean", "(Ljava/lang/Object;)Z")]
         public bool GetBoolean(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getByte", "(Ljava/lang/Object;)B")]
         public sbyte GetByte(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getChar", "(Ljava/lang/Object;)C")]
         public char GetChar(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDouble", "(Ljava/lang/Object;)D")]
         public double GetDouble(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getFloat", "(Ljava/lang/Object;)F")]
         public float GetFloat(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getInt", "(Ljava/lang/Object;)I")]
         public int GetInt(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getLong", "(Ljava/lang/Object;)J")]
         public long GetLong(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getShort", "(Ljava/lang/Object;)S")]
         public short GetShort(Java.Lang.Object? obj) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("set", "(Ljava/lang/Object;Ljava/lang/Object;)V")]
         public void Set(Java.Lang.Object? obj, Java.Lang.Object? value) { }
+        [Java.Interop.JniMethodSignatureAttribute("setBoolean", "(Ljava/lang/Object;Z)V")]
         public void SetBoolean(Java.Lang.Object? obj, bool z) { }
+        [Java.Interop.JniMethodSignatureAttribute("setByte", "(Ljava/lang/Object;B)V")]
         public void SetByte(Java.Lang.Object? obj, sbyte b) { }
+        [Java.Interop.JniMethodSignatureAttribute("setChar", "(Ljava/lang/Object;C)V")]
         public void SetChar(Java.Lang.Object? obj, char c) { }
+        [Java.Interop.JniMethodSignatureAttribute("setDouble", "(Ljava/lang/Object;D)V")]
         public void SetDouble(Java.Lang.Object? obj, double d) { }
+        [Java.Interop.JniMethodSignatureAttribute("setFloat", "(Ljava/lang/Object;F)V")]
         public void SetFloat(Java.Lang.Object? obj, float f) { }
+        [Java.Interop.JniMethodSignatureAttribute("setInt", "(Ljava/lang/Object;I)V")]
         public void SetInt(Java.Lang.Object? obj, int i) { }
+        [Java.Interop.JniMethodSignatureAttribute("setLong", "(Ljava/lang/Object;J)V")]
         public void SetLong(Java.Lang.Object? obj, long l) { }
+        [Java.Interop.JniMethodSignatureAttribute("setShort", "(Ljava/lang/Object;S)V")]
         public void SetShort(Java.Lang.Object? obj, short s) { }
+        [Java.Interop.JniMethodSignatureAttribute("toGenericString", "()Ljava/lang/String;")]
         public string? ToGenericString() { throw null; }
         public static partial class InterfaceConsts
         {
@@ -5040,62 +6620,75 @@ public GenericSignatureFormatError(string? message) { }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedArrayType", GenerateJavaPeer=false)]
     public partial interface IAnnotatedArrayType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
     {
-        Java.Lang.Reflect.IAnnotatedType? AnnotatedGenericComponentType { get; }
-        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { get; }
+        Java.Lang.Reflect.IAnnotatedType? AnnotatedGenericComponentType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedGenericComponentType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
+        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedElement", GenerateJavaPeer=false)]
     public partial interface IAnnotatedElement : Java.Interop.IJavaPeerable, System.IDisposable
     {
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         Java.Lang.Object? GetAnnotation(Java.Lang.Class? p0);
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations();
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         Java.Interop.JavaObjectArray<Java.Lang.Object>? GetAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         Java.Lang.Object? GetDeclaredAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations();
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         Java.Interop.JavaObjectArray<Java.Lang.Object>? GetDeclaredAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAnnotationPresent", "(Ljava/lang/Class;)Z")]
         bool IsAnnotationPresent(Java.Lang.Class? annotationClass) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedParameterizedType", GenerateJavaPeer=false)]
     public partial interface IAnnotatedParameterizedType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
     {
-        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { get; }
+        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedActualTypeArguments", "()[Ljava/lang/reflect/AnnotatedType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedActualTypeArguments();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedType", GenerateJavaPeer=false)]
     public partial interface IAnnotatedType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, System.IDisposable
     {
         Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { get { throw null; } }
-        Java.Lang.Reflect.IType? Type { get; }
+        Java.Lang.Reflect.IType? Type { [Java.Interop.JniMethodSignatureAttribute("getType", "()Ljava/lang/reflect/Type;")] get; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedTypeVariable", GenerateJavaPeer=false)]
     public partial interface IAnnotatedTypeVariable : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
     {
-        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { get; }
+        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedBounds();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/AnnotatedWildcardType", GenerateJavaPeer=false)]
     public partial interface IAnnotatedWildcardType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IAnnotatedType, System.IDisposable
     {
-        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { get; }
+        new Java.Lang.Reflect.IAnnotatedType? AnnotatedOwnerType { [Java.Interop.JniMethodSignatureAttribute("getAnnotatedOwnerType", "()Ljava/lang/reflect/AnnotatedType;")] get; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedLowerBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedLowerBounds();
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedUpperBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedUpperBounds();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/GenericArrayType", GenerateJavaPeer=false)]
     public partial interface IGenericArrayType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IType, System.IDisposable
     {
-        Java.Lang.Reflect.IType? GenericComponentType { get; }
+        Java.Lang.Reflect.IType? GenericComponentType { [Java.Interop.JniMethodSignatureAttribute("getGenericComponentType", "()Ljava/lang/reflect/Type;")] get; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/GenericDeclaration", GenerateJavaPeer=false)]
     public partial interface IGenericDeclaration : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.ITypeVariable>? GetTypeParameters();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/InvocationHandler", GenerateJavaPeer=false)]
     public partial interface IInvocationHandler : Java.Interop.IJavaPeerable, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("invoke", "(Ljava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;")]
         Java.Lang.Object? Invoke(Java.Lang.Object? p0, Java.Lang.Reflect.Method? p1, Java.Interop.JavaObjectArray<Java.Lang.Object>? p2);
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Member", GenerateJavaPeer=false)]
@@ -5103,10 +6696,10 @@ public partial interface IMember : Java.Interop.IJavaPeerable, System.IDisposabl
     {
         public const int Declared = 1;
         public const int Public = 0;
-        Java.Lang.Class? DeclaringClass { get; }
-        bool IsSynthetic { get; }
-        int Modifiers { get; }
-        string? Name { get; }
+        Java.Lang.Class? DeclaringClass { [Java.Interop.JniMethodSignatureAttribute("getDeclaringClass", "()Ljava/lang/Class;")] get; }
+        bool IsSynthetic { [Java.Interop.JniMethodSignatureAttribute("isSynthetic", "()Z")] get; }
+        int Modifiers { [Java.Interop.JniMethodSignatureAttribute("getModifiers", "()I")] get; }
+        string? Name { [Java.Interop.JniMethodSignatureAttribute("getName", "()Ljava/lang/String;")] get; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/InaccessibleObjectException", GenerateJavaPeer=false)]
     public partial class InaccessibleObjectException : Java.Lang.RuntimeException
@@ -5133,8 +6726,9 @@ public InvocationTargetException(Java.Lang.Throwable? target, string? s) { }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/ParameterizedType", GenerateJavaPeer=false)]
     public partial interface IParameterizedType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IType, System.IDisposable
     {
-        Java.Lang.Reflect.IType? OwnerType { get; }
-        Java.Lang.Reflect.IType? RawType { get; }
+        Java.Lang.Reflect.IType? OwnerType { [Java.Interop.JniMethodSignatureAttribute("getOwnerType", "()Ljava/lang/reflect/Type;")] get; }
+        Java.Lang.Reflect.IType? RawType { [Java.Interop.JniMethodSignatureAttribute("getRawType", "()Ljava/lang/reflect/Type;")] get; }
+        [Java.Interop.JniMethodSignatureAttribute("getActualTypeArguments", "()[Ljava/lang/reflect/Type;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetActualTypeArguments();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Type", GenerateJavaPeer=false)]
@@ -5146,15 +6740,19 @@ public partial interface IType : Java.Interop.IJavaPeerable, System.IDisposable
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/TypeVariable", GenerateJavaPeer=false)]
     public partial interface ITypeVariable : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IAnnotatedElement, Java.Lang.Reflect.IType, System.IDisposable
     {
-        Java.Lang.Object? GenericDeclaration { get; }
-        string? Name { get; }
+        Java.Lang.Object? GenericDeclaration { [Java.Interop.JniMethodSignatureAttribute("getGenericDeclaration", "()Ljava/lang/reflect/GenericDeclaration;")] get; }
+        string? Name { [Java.Interop.JniMethodSignatureAttribute("getName", "()Ljava/lang/String;")] get; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotatedBounds", "()[Ljava/lang/reflect/AnnotatedType;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IAnnotatedType>? GetAnnotatedBounds();
+        [Java.Interop.JniMethodSignatureAttribute("getBounds", "()[Ljava/lang/reflect/Type;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetBounds();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/WildcardType", GenerateJavaPeer=false)]
     public partial interface IWildcardType : Java.Interop.IJavaPeerable, Java.Lang.Reflect.IType, System.IDisposable
     {
+        [Java.Interop.JniMethodSignatureAttribute("getLowerBounds", "()[Ljava/lang/reflect/Type;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetLowerBounds();
+        [Java.Interop.JniMethodSignatureAttribute("getUpperBounds", "()[Ljava/lang/reflect/Type;")]
         Java.Interop.JavaObjectArray<Java.Lang.Reflect.IType>? GetUpperBounds();
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/MalformedParameterizedTypeException", GenerateJavaPeer=false)]
@@ -5193,11 +6791,17 @@ public sealed partial class Method : Java.Lang.Reflect.Executable
         public override int Modifiers { get { throw null; } }
         public override string? Name { get { throw null; } }
         public Java.Lang.Class? ReturnType { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getExceptionTypes", "()[Ljava/lang/Class;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Class>? GetExceptionTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getParameterAnnotations", "()[[Ljava/lang/annotation/Annotation;")]
         public override Java.Interop.JavaObjectArray<Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>>? GetParameterAnnotations() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getParameterTypes", "()[Ljava/lang/Class;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Class>? GetParameterTypes() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getTypeParameters", "()[Ljava/lang/reflect/TypeVariable;")]
         public override Java.Interop.JavaObjectArray<Java.Lang.Reflect.ITypeVariable>? GetTypeParameters() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;")]
         public Java.Lang.Object? Invoke(Java.Lang.Object? obj, params Java.Lang.Object[]? args) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toGenericString", "()Ljava/lang/String;")]
         public override string? ToGenericString() { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Modifier", GenerateJavaPeer=false)]
@@ -5220,24 +6824,43 @@ protected Modifier(ref Java.Interop.JniObjectReference reference, Java.Interop.J
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("classModifiers", "()I")]
         public static int ClassModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("constructorModifiers", "()I")]
         public static int ConstructorModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("fieldModifiers", "()I")]
         public static int FieldModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("interfaceModifiers", "()I")]
         public static int InterfaceModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isAbstract", "(I)Z")]
         public static bool IsAbstract(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isFinal", "(I)Z")]
         public static bool IsFinal(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isInterface", "(I)Z")]
         public static bool IsInterface(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isNative", "(I)Z")]
         public static bool IsNative(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isPrivate", "(I)Z")]
         public static bool IsPrivate(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isProtected", "(I)Z")]
         public static bool IsProtected(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isPublic", "(I)Z")]
         public static bool IsPublic(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isStatic", "(I)Z")]
         public static bool IsStatic(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isStrict", "(I)Z")]
         public static bool IsStrict(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isSynchronized", "(I)Z")]
         public static bool IsSynchronized(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isTransient", "(I)Z")]
         public static bool IsTransient(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isVolatile", "(I)Z")]
         public static bool IsVolatile(int mod) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("methodModifiers", "()I")]
         public static int MethodModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("parameterModifiers", "()I")]
         public static int ParameterModifiers() { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("toString", "(I)Ljava/lang/String;")]
         public static string? ToString(int mod) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Parameter", GenerateJavaPeer=false)]
@@ -5258,14 +6881,20 @@ internal Parameter() { }
         public Java.Lang.Reflect.IType? ParameterizedType { get { throw null; } }
         public Java.Lang.Class? Type { get { throw null; } }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public Java.Lang.Object? GetAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotation", "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;")]
         public Java.Lang.Object? GetDeclaredAnnotation(Java.Lang.Class? annotationClass) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotations", "()[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Annotation.IAnnotation>? GetDeclaredAnnotations() { throw null; }
         [Java.Interop.JavaTypeParametersAttribute(new string[]{ "T extends java.lang.annotation.Annotation"})]
+        [Java.Interop.JniMethodSignatureAttribute("getDeclaredAnnotationsByType", "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;")]
         public Java.Interop.JavaObjectArray<Java.Lang.Object>? GetDeclaredAnnotationsByType(Java.Lang.Class? annotationClass) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/Proxy", GenerateJavaPeer=false)]
@@ -5277,10 +6906,14 @@ protected Proxy(Java.Lang.Reflect.IInvocationHandler? h) { }
         [System.ComponentModel.EditorBrowsableAttribute(1)]
         [System.Diagnostics.DebuggerBrowsableAttribute(0)]
         public override Java.Interop.JniPeerMembers JniPeerMembers { get { throw null; } }
+        [Java.Interop.JniMethodSignatureAttribute("getInvocationHandler", "(Ljava/lang/Object;)Ljava/lang/reflect/InvocationHandler;")]
         public static Java.Lang.Reflect.IInvocationHandler? GetInvocationHandler(Java.Lang.Object? proxy) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("getProxyClass", "(Ljava/lang/ClassLoader;[Ljava/lang/Class;)Ljava/lang/Class;")]
         [System.ObsoleteAttribute("deprecated")]
         public static Java.Lang.Class? GetProxyClass(Java.Lang.ClassLoader? loader, params Java.Lang.Class[]? interfaces) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("isProxyClass", "(Ljava/lang/Class;)Z")]
         public static bool IsProxyClass(Java.Lang.Class? cl) { throw null; }
+        [Java.Interop.JniMethodSignatureAttribute("newProxyInstance", "(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;")]
         public static Java.Lang.Object? NewProxyInstance(Java.Lang.ClassLoader? loader, Java.Interop.JavaObjectArray<Java.Lang.Class>? interfaces, Java.Lang.Reflect.IInvocationHandler? h) { throw null; }
     }
     [Java.Interop.JniTypeSignatureAttribute("java/lang/reflect/UndeclaredThrowableException", GenerateJavaPeer=false)]
diff --git a/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs b/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
index 7a8109cd5..03c419bbc 100644
--- a/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
+++ b/src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Reflection.Emit;
 using System.Text;
 
 using Java.Interop.Expressions;
@@ -241,15 +242,6 @@ public LambdaExpression CreateMarshalToManagedExpression (MethodInfo method, Jav
 
 		static Type GetMarshalerType (Type returnType, List<Type> funcTypeParams, Type declaringType)
 		{
-			// `mscorlib.dll` & `System.Core.dll` only provide Action<…>/Func<…> types for up to 16 parameters
-			if (funcTypeParams.Count <= 16) {
-				if (returnType != null)
-					funcTypeParams.Add (returnType);
-				return returnType == null
-					? Expression.GetActionType (funcTypeParams.ToArray ())
-					: Expression.GetFuncType (funcTypeParams.ToArray ());
-			}
-
 			// Too many parameters; does a `_JniMarshal_*` type exist in the type's declaring assembly?
 			funcTypeParams.RemoveRange (0, 2);
 			var marshalDelegateName = new StringBuilder ();
@@ -265,11 +257,58 @@ static Type GetMarshalerType (Type returnType, List<Type> funcTypeParams, Type d
 			}
 
 			Type marshalDelegateType = declaringType.Assembly.GetType (marshalDelegateName.ToString (), throwOnError: false);
+			if (marshalDelegateType != null) {
+				return marshalDelegateType;
+			}
 
+#if !NET
 			// Punt?; System.Linq.Expressions will automagically produce the needed delegate type.
 			// Unfortunately, this won't work with jnimarshalmethod-gen.exe.
 			return marshalDelegateType;
+#else   // NET
+			return CreateMarshalDelegateType (marshalDelegateName.ToString (), returnType, funcTypeParams);
+#endif  // NET
+		}
+
+#if NET
+		static object           ab_lock         = new object ();
+		static AssemblyBuilder  assemblyBuilder;
+		static ModuleBuilder    moduleBuilder;
+		static Type[]           DelegateCtorSignature;
+
+		static Type CreateMarshalDelegateType (string name, Type returnType, List<Type> funcTypeParams)
+		{
+			lock (ab_lock) {
+				if (assemblyBuilder == null) {
+					var aname       = new AssemblyName ("jni-marshal-method-delegates");
+					assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly (aname, AssemblyBuilderAccess.Run);
+					moduleBuilder   = assemblyBuilder.DefineDynamicModule (aname.Name!);
+
+					DelegateCtorSignature = new Type[] {
+						typeof (object),
+						typeof (IntPtr)
+					};
+				}
+				funcTypeParams.Insert (0, typeof (IntPtr));
+				funcTypeParams.Insert (0, typeof (IntPtr));
+				var typeBuilder = moduleBuilder.DefineType (
+					name,
+					TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass,
+					typeof (MulticastDelegate)
+				);
+
+				const MethodAttributes      CtorAttributes      = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;
+				const MethodImplAttributes  ImplAttributes      = MethodImplAttributes.Runtime | MethodImplAttributes.Managed;
+				const MethodAttributes      InvokeAttributes    = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Virtual;
+
+				typeBuilder.DefineConstructor (CtorAttributes, CallingConventions.Standard, DelegateCtorSignature)
+					.SetImplementationFlags (ImplAttributes);
+				typeBuilder.DefineMethod ("Invoke", InvokeAttributes, returnType, funcTypeParams.ToArray ())
+					.SetImplementationFlags (ImplAttributes);
+				return typeBuilder.CreateTypeInfo ();
+			}
 		}
+#endif  // NET
 
 		static char GetJniMarshalDelegateParameterIdentifier (Type type)
 		{
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
index 32833cb72..bcd073bdc 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
@@ -20,6 +20,11 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers {
 
+	public enum JavaPeerStyle {
+		XAJavaInterop1,
+		JavaInterop1,
+	}
+
 	 public class JavaCallableWrapperGenerator {
 
 		class JavaFieldInfo {
@@ -76,6 +81,7 @@ public JavaCallableWrapperGenerator (TypeDefinition type, Action<string, object[
 		}
 
 		public  string          ApplicationJavaClass            { get; set; }
+		public  JavaPeerStyle   CodeGenerationTarget            { get; set; }
 
 		public bool GenerateOnCreateOverrides { get; set; }
 
@@ -101,7 +107,7 @@ void AddNestedTypes (TypeDefinition type)
 					continue;
 				if (!JavaNativeTypeManager.IsNonStaticInnerClass (nt, cache))
 					continue;
-				children.Add (new JavaCallableWrapperGenerator (nt, JavaNativeTypeManager.ToJniName (type), log, cache));
+				children.Add (new JavaCallableWrapperGenerator (nt, JavaNativeTypeManager.ToJniName (type, cache), log, cache));
 				if (nt.HasNestedTypes)
 					AddNestedTypes (nt);
 			}
@@ -117,7 +123,7 @@ void AddNestedTypes (TypeDefinition type)
 			if (type.IsEnum || type.IsInterface || type.IsValueType)
 				Diagnostic.Error (4200, LookupSource (type), Localization.Resources.JavaCallableWrappers_XA4200, type.FullName);
 
-			string jniName = JavaNativeTypeManager.ToJniName (type);
+			string jniName = JavaNativeTypeManager.ToJniName (type, resolver);
 			if (jniName == null)
 				Diagnostic.Error (4201, LookupSource (type), Localization.Resources.JavaCallableWrappers_XA4201, type.FullName);
 			if (!string.IsNullOrEmpty (outerType)) {
@@ -157,7 +163,7 @@ void AddNestedTypes (TypeDefinition type)
 									r.FullName);
 						return d;
 					})
-					.Where (d => GetRegisterAttributes (d).Any ())
+					.Where (d => GetTypeRegistrationAttributes (d).Any ())
 					.SelectMany (d => d.Methods)
 					.Where (m => !m.IsStatic)) {
 				AddMethod (imethod, imethod);
@@ -168,7 +174,7 @@ void AddNestedTypes (TypeDefinition type)
 			};
 			foreach (var bt in type.GetBaseTypes (cache)) {
 				ctorTypes.Add (bt);
-				RegisterAttribute rattr = GetRegisterAttributes (bt).FirstOrDefault ();
+				RegisterAttribute rattr = GetMethodRegistrationAttributes (bt).FirstOrDefault ();
 				if (rattr != null && rattr.DoNotGenerateAcw)
 					break;
 			}
@@ -271,7 +277,7 @@ void AddConstructor (MethodDefinition ctor, TypeDefinition type, string outerTyp
 					return;
 				}
 
-				RegisterAttribute rattr = GetRegisterAttributes (ctor).FirstOrDefault ();
+				RegisterAttribute rattr = GetMethodRegistrationAttributes (ctor).FirstOrDefault ();
 				if (rattr != null) {
 					if (ctors.Any (c => c.JniSignature == rattr.Signature))
 						return;
@@ -335,6 +341,34 @@ internal static RegisterAttribute ToRegisterAttribute (CustomAttribute attr)
 			return r;
 		}
 
+		internal static RegisterAttribute RegisterFromJniTypeSignatureAttribute (CustomAttribute attr)
+		{
+			// attr.Resolve ();
+			RegisterAttribute r = null;
+			if (attr.ConstructorArguments.Count == 1)
+				r = new RegisterAttribute ((string) attr.ConstructorArguments [0].Value);
+			if (r != null) {
+				var v = attr.Properties.FirstOrDefault (p => p.Name == "GenerateJavaPeer");
+				if (v.Name == null) {
+					r.DoNotGenerateAcw = false;
+				} else if (v.Name == "GenerateJavaPeer") {
+					r.DoNotGenerateAcw = ! (bool) v.Argument.Value;
+				}
+			}
+			return r;
+		}
+
+		internal static RegisterAttribute RegisterFromJniMethodSignatureAttribute (CustomAttribute attr)
+		{
+			// attr.Resolve ();
+			RegisterAttribute r = null;
+			if (attr.ConstructorArguments.Count == 2)
+				r = new RegisterAttribute ((string) attr.ConstructorArguments [0].Value,
+					(string) attr.ConstructorArguments [1].Value,
+					"");
+			return r;
+		}
+
 		ExportAttribute ToExportAttribute (CustomAttribute attr, IMemberDefinition declaringMember)
 		{
 			var name = attr.ConstructorArguments.Count > 0 ? (string) attr.ConstructorArguments [0].Value : declaringMember.Name;
@@ -351,9 +385,24 @@ internal static ExportFieldAttribute ToExportFieldAttribute (CustomAttribute att
 			return new ExportFieldAttribute ((string) attr.ConstructorArguments [0].Value);
 		}
 
-		static IEnumerable<RegisterAttribute> GetRegisterAttributes (Mono.Cecil.ICustomAttributeProvider p)
+		internal static IEnumerable<RegisterAttribute> GetTypeRegistrationAttributes (Mono.Cecil.ICustomAttributeProvider p)
 		{
-			return GetAttributes<RegisterAttribute> (p, a => ToRegisterAttribute (a));
+			foreach (var a in GetAttributes<RegisterAttribute> (p, a => ToRegisterAttribute (a))) {
+				yield return a;
+			}
+			foreach (var c in p.GetCustomAttributes ("Java.Interop.JniTypeSignatureAttribute")) {
+				yield return RegisterFromJniTypeSignatureAttribute (c);
+			}
+		}
+
+		static IEnumerable<RegisterAttribute> GetMethodRegistrationAttributes (Mono.Cecil.ICustomAttributeProvider p)
+		{
+			foreach (var a in GetAttributes<RegisterAttribute> (p, a => ToRegisterAttribute (a))) {
+				yield return a;
+			}
+			foreach (var c in p.GetCustomAttributes ("Java.Interop.JniMethodSignatureAttribute")) {
+				yield return RegisterFromJniMethodSignatureAttribute (c);
+			}
 		}
 
 		IEnumerable<ExportAttribute> GetExportAttributes (IMemberDefinition p)
@@ -375,7 +424,7 @@ static IEnumerable<TAttribute> GetAttributes<TAttribute> (Mono.Cecil.ICustomAttr
 		void AddMethod (MethodDefinition registeredMethod, MethodDefinition implementedMethod)
 		{
 			if (registeredMethod != null)
-				foreach (RegisterAttribute attr in GetRegisterAttributes (registeredMethod)) {
+				foreach (RegisterAttribute attr in GetMethodRegistrationAttributes (registeredMethod)) {
 					// Check for Kotlin-mangled methods that cannot be overridden
 					if (attr.Name.Contains ("-impl") || (attr.Name.Length > 7 && attr.Name[attr.Name.Length - 8] == '-'))
 						Diagnostic.Error (4217, LookupSource (implementedMethod), Localization.Resources.JavaCallableWrappers_XA4217, attr.Name);
@@ -544,19 +593,27 @@ void GenerateHeader (TextWriter sw)
 
 			sw.WriteLine ("public " + (type.IsAbstract ? "abstract " : "") + "class " + name);
 
-			string extendsType = GetJavaTypeName (type.BaseType);
+			string extendsType = GetJavaTypeName (type.BaseType, cache);
 			if (extendsType == "android.app.Application" && !string.IsNullOrEmpty (ApplicationJavaClass))
 				extendsType = ApplicationJavaClass;
 			sw.WriteLine ("\textends " + extendsType);
 			sw.WriteLine ("\timplements");
-			sw.Write ("\t\tmono.android.IGCUserPeer");
+			sw.Write ("\t\t");
+			switch (CodeGenerationTarget) {
+				case JavaPeerStyle.JavaInterop1:
+					sw.Write ("com.xamarin.java_interop.GCUserPeerable");
+					break;
+				default:
+					sw.Write ("mono.android.IGCUserPeer");
+					break;
+			}
 			IEnumerable<TypeDefinition> ifaces = type.Interfaces.Select (ifaceInfo => ifaceInfo.InterfaceType)
 				.Select (r => r.Resolve ())
-				.Where (d => GetRegisterAttributes (d).Any ());
+				.Where (d => GetTypeRegistrationAttributes (d).Any ());
 			if (ifaces.Any ()) {
 				foreach (TypeDefinition iface in ifaces) {
 					sw.WriteLine (",");
-					sw.Write ("\t\t{0}", GetJavaTypeName (iface));
+					sw.Write ("\t\t{0}", GetJavaTypeName (iface, cache));
 				}
 			}
 			sw.WriteLine ();
@@ -590,16 +647,23 @@ void GenerateBody (TextWriter sw)
 						w.WriteLine ("\t\tsuper.onCreate (arguments);");
 				});
 
+			string addRef       = "monodroidAddReference";
+			string clearRefs    = "monodroidClearReferences";
+			if (CodeGenerationTarget == JavaPeerStyle.JavaInterop1) {
+				addRef      = "jiAddManagedReference";
+				clearRefs   = "jiClearManagedReferences";
+			}
+
 			sw.WriteLine ();
 			sw.WriteLine ("\tprivate java.util.ArrayList refList;");
-			sw.WriteLine ("\tpublic void monodroidAddReference (java.lang.Object obj)");
+			sw.WriteLine ($"\tpublic void {addRef} (java.lang.Object obj)");
 			sw.WriteLine ("\t{");
 			sw.WriteLine ("\t\tif (refList == null)");
 			sw.WriteLine ("\t\t\trefList = new java.util.ArrayList ();");
 			sw.WriteLine ("\t\trefList.add (obj);");
 			sw.WriteLine ("\t}");
 			sw.WriteLine ();
-			sw.WriteLine ("\tpublic void monodroidClearReferences ()");
+			sw.WriteLine ($"\tpublic void {clearRefs} ()");
 			sw.WriteLine ("\t{");
 			sw.WriteLine ("\t\tif (refList != null)");
 			sw.WriteLine ("\t\t\trefList.clear ();");
@@ -612,9 +676,19 @@ void GenerateRegisterType (TextWriter sw, JavaCallableWrapperGenerator self, str
 			foreach (Signature method in self.methods)
 				sw.WriteLine ("\t\t\t\"{0}\\n\" +", method.Method);
 			sw.WriteLine ("\t\t\t\"\";");
-			if (!CannotRegisterInStaticConstructor (self.type))
-				sw.WriteLine ("\t\tmono.android.Runtime.register (\"{0}\", {1}.class, {2});",
-						self.type.GetPartialAssemblyQualifiedName (cache), self.name, field);
+			if (CannotRegisterInStaticConstructor (self.type))
+				return;
+			string format = null;
+			switch (CodeGenerationTarget) {
+				case JavaPeerStyle.JavaInterop1:
+					format = "com.xamarin.java_interop.ManagedPeer.registerNativeMembers ({1}.class, \"{0}\", {2});";
+					break;
+				default:
+					format = "mono.android.Runtime.register (\"{0}\", {1}.class, {2});";
+					break;
+			}
+			sw.Write ("\t\t");
+			sw.WriteLine (format, self.type.GetPartialAssemblyQualifiedName (cache), self.name, field);
 		}
 
 		void GenerateFooter (TextWriter sw)
@@ -636,10 +710,10 @@ static string GetJavaAccess (MethodAttributes access)
 			}
 		}
 
-		static string GetJavaTypeName (TypeReference r)
+		static string GetJavaTypeName (TypeReference r, IMetadataResolver cache)
 		{
 			TypeDefinition d = r.Resolve ();
-			string jniName = JavaNativeTypeManager.ToJniName (d);
+			string jniName = JavaNativeTypeManager.ToJniName (d, cache);
 			if (jniName == null)
 				Diagnostic.Error (4201, Localization.Resources.JavaCallableWrappers_XA4201, r.FullName);
 			return jniName.Replace ('/', '.').Replace ('$', '.');
@@ -780,8 +854,19 @@ void GenerateConstructor (Signature ctor, TextWriter sw)
 			sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}..ctor({1}): time: \"+java.lang.System.currentTimeMillis());", name, ctor.Params);
 #endif
 			if (!CannotRegisterInStaticConstructor (type)) {
-				sw.WriteLine ("\t\tif (getClass () == {0}.class)", name);
-				sw.WriteLine ("\t\t\tmono.android.TypeManager.Activate (\"{0}\", \"{1}\", this, new java.lang.Object[] {{ {2} }});", type.GetPartialAssemblyQualifiedName (cache), ctor.ManagedParameters, ctor.ActivateCall);
+				string format = null;
+				switch (CodeGenerationTarget) {
+					case JavaPeerStyle.JavaInterop1:
+						format = "com.xamarin.java_interop.ManagedPeer.construct (this, \"{0}\", \"{1}\", new java.lang.Object[] {{ {2} }});";
+						break;
+					default:
+						format = "mono.android.TypeManager.Activate (\"{0}\", \"{1}\", this, new java.lang.Object[] {{ {2} }});";
+						break;
+				}
+				sw.WriteLine ("\t\tif (getClass () == {0}.class) {{", name);
+				sw.Write ("\t\t\t");
+				sw.WriteLine (format, type.GetPartialAssemblyQualifiedName (cache), ctor.ManagedParameters, ctor.ActivateCall);
+				sw.WriteLine ("\t\t}");
 			}
 			sw.WriteLine ("\t}");
 		}
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
index 18f34d435..474616dd4 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaTypeScanner.cs
@@ -88,9 +88,8 @@ public static bool ShouldSkipJavaCallableWrapperGeneration (TypeDefinition type,
 			if (JavaNativeTypeManager.IsNonStaticInnerClass (type, resolver))
 				return true;
 
-			foreach (var r in type.GetCustomAttributes (typeof (global::Android.Runtime.RegisterAttribute))) {
-
-				if (JavaCallableWrapperGenerator.ToRegisterAttribute (r).DoNotGenerateAcw) {
+			foreach (var c in JavaCallableWrapperGenerator.GetTypeRegistrationAttributes (type)) {
+				if (c.DoNotGenerateAcw) {
 					return true;
 				}
 			}
diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
index 4ad4c92a5..2f7afd86e 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/TypeNameMapGenerator.cs
@@ -165,12 +165,12 @@ public void WriteJavaToManaged (Stream output)
 			var typeMap = GetTypeMapping (
 					t => t.IsInterface || t.HasGenericParameters,
 					JavaNativeTypeManager.ToJniName,
-					t => t.GetPartialAssemblyQualifiedName (Cache));
+					(t, c) => t.GetPartialAssemblyQualifiedName (c));
 
 			WriteBinaryMapping (output, typeMap);
 		}
 
-		Dictionary<string, string> GetTypeMapping (Func<TypeDefinition, bool> skipType, Func<TypeDefinition, string> key, Func<TypeDefinition, string> value)
+		Dictionary<string, string> GetTypeMapping (Func<TypeDefinition, bool> skipType, Func<TypeDefinition, IMetadataResolver, string> key, Func<TypeDefinition, IMetadataResolver, string> value)
 		{
 			var typeMap     = new Dictionary<string, TypeDefinition> ();
 			var aliases     = new Dictionary<string, List<string>> ();
@@ -178,7 +178,7 @@ Dictionary<string, string> GetTypeMapping (Func<TypeDefinition, bool> skipType,
 				if (skipType (type))
 					continue;
 
-				var k = key (type);
+				var k = key (type, Cache);
 
 				TypeDefinition e;
 				if (!typeMap.TryGetValue (k, out e)) {
@@ -194,9 +194,9 @@ Dictionary<string, string> GetTypeMapping (Func<TypeDefinition, bool> skipType,
 					List<string> a;
 					if (!aliases.TryGetValue (k, out a)) {
 						aliases.Add (k, a = new List<string> ());
-						a.Add (value (e));
+						a.Add (value (e, Cache));
 					}
-					a.Add (value (type));
+					a.Add (value (type, Cache));
 				}
 			}
 			foreach (var e in aliases.OrderBy (e => e.Key)) {
@@ -206,7 +206,7 @@ Dictionary<string, string> GetTypeMapping (Func<TypeDefinition, bool> skipType,
 					Log (TraceLevel.Info, $"  Ignoring: {o}");
 				}
 			}
-			return typeMap.ToDictionary (e => e.Key, e => value (e.Value));
+			return typeMap.ToDictionary (e => e.Key, e => value (e.Value, Cache));
 		}
 
 		static void WriteBinaryMapping (Stream o, Dictionary<string, string> mapping)
@@ -258,7 +258,7 @@ public void WriteManagedToJava (Stream output)
 
 			var typeMap = GetTypeMapping (
 					t => false,
-					t => t.GetPartialAssemblyQualifiedName (Cache),
+					(t, c) => t.GetPartialAssemblyQualifiedName (c),
 					JavaNativeTypeManager.ToJniName);
 
 			WriteBinaryMapping (output, typeMap);
diff --git a/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs b/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
index c8d4fa405..e050be67a 100644
--- a/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
+++ b/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
@@ -497,6 +497,7 @@ static string ToCompatPackageName (TypeDefinition type)
 		}
 
 		// Keep in sync with ToJniNameFromAttributes(Type) and ToJniName(Type)
+		[Obsolete ("Use the TypeDefinitionCache overload for better performance.")]
 		public static string ToJniName (TypeDefinition type) =>
 			ToJniName (type, resolver: null);
 
@@ -505,8 +506,9 @@ public static string ToJniName (TypeDefinition type, TypeDefinitionCache? cache)
 
 		public static string ToJniName (TypeDefinition type, IMetadataResolver? resolver)
 		{
-			return ToJniName (type, ExportParameterKind.Unspecified, resolver) ??
+			var x = ToJniName (type, ExportParameterKind.Unspecified, resolver) ??
 				"java/lang/Object";
+			return x;
 		}
 
 		static string? ToJniName (TypeDefinition type, ExportParameterKind exportKind, IMetadataResolver? cache)
@@ -520,7 +522,8 @@ public static string ToJniName (TypeDefinition type, IMetadataResolver? resolver
 			if (type.FullName == "System.String")
 				return "java/lang/String";
 
-			if (!type.ImplementsInterface ("Android.Runtime.IJavaObject", cache)) {
+			if (!type.ImplementsInterface ("Android.Runtime.IJavaObject", cache) && 
+					!type.ImplementsInterface ("Java.Interop.IJavaPeerable", cache)) {
 				return GetSpecialExportJniType (type.FullName, exportKind);
 			}
 
@@ -535,6 +538,26 @@ public static string ToJniName (TypeDefinition type, IMetadataResolver? resolver
 		}
 
 		static string? ToJniNameFromAttributes (TypeDefinition type, IMetadataResolver? resolver)
+		{
+			return ToJniNameFromAttributesForAndroid (type, resolver) ??
+				ToJniNameFromAttributesForInterop (type, resolver);
+		}
+
+		static string? ToJniNameFromAttributesForInterop (TypeDefinition type, IMetadataResolver? resolver)
+		{
+			var attr = type.CustomAttributes.FirstOrDefault (a =>
+				Resolve (resolver, a.AttributeType)
+				.FullName == "Java.Interop.JniTypeSignatureAttribute");
+			if (attr == null) {
+				return null;
+			}
+			var carg    = attr.ConstructorArguments.FirstOrDefault ();
+			if (carg.Type == null || carg.Type.FullName != "System.String")
+				return null;
+			return (string) carg.Value;
+		}
+
+		static string? ToJniNameFromAttributesForAndroid (TypeDefinition type, IMetadataResolver? resolver)
 		{
 			#region CustomAttribute alternate name support
 			var attrs = type.CustomAttributes.Where (a => Resolve (resolver, a.AttributeType).Interfaces.Any (it => it.InterfaceType.FullName == typeof (IJniNameProviderAttribute).FullName));
diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.Types.cs b/src/Java.Interop/Java.Interop/JniEnvironment.Types.cs
index 1e2ea6fad..cfa49f8d9 100644
--- a/src/Java.Interop/Java.Interop/JniEnvironment.Types.cs
+++ b/src/Java.Interop/Java.Interop/JniEnvironment.Types.cs
@@ -178,9 +178,9 @@ public static void RegisterNatives (JniObjectReference type, JniNativeMethodRegi
 				foreach (var m in methods) {
 					if (m.Marshaler.GetType ().GenericTypeArguments.Length != 0) {
 						var method  = m.Marshaler.Method;
-						Debug.WriteLine ($"JNIEnv::RegisterNatives() given a generic delegate type.  .NET Core doesn't like this.");
+						Debug.WriteLine ($"JNIEnv::RegisterNatives() given a generic delegate type `{m.Marshaler.GetType()}`.  .NET Core doesn't like this.");
 						Debug.WriteLine ($"  Java: {m.Name}{m.Signature}");
-						Debug.WriteLine ($"  Marshaler Type={m.Marshaler.GetType ().FullName} Method={method.DeclaringType!.FullName}.{method.Name}");
+						Debug.WriteLine ($"  Marshaler Type={m.Marshaler.GetType ().FullName} Method={method.DeclaringType?.FullName}.{method.Name}");
 					}
 				}
 #endif  // DEBUG && NETCOREAPP
diff --git a/src/Java.Interop/Java.Interop/JniMemberSignatureAttribute.cs b/src/Java.Interop/Java.Interop/JniMemberSignatureAttribute.cs
new file mode 100644
index 000000000..693149eae
--- /dev/null
+++ b/src/Java.Interop/Java.Interop/JniMemberSignatureAttribute.cs
@@ -0,0 +1,27 @@
+#nullable enable
+
+using System;
+
+#if NET
+
+namespace Java.Interop
+{
+	public abstract class JniMemberSignatureAttribute : Attribute {
+
+		internal JniMemberSignatureAttribute (string memberName, string memberSignature)
+		{
+			if (string.IsNullOrEmpty (memberName))
+				throw new ArgumentNullException (nameof (memberName));
+			if (string.IsNullOrEmpty (memberSignature))
+				throw new ArgumentNullException (nameof (memberSignature));
+
+			MemberName          = memberName;
+			MemberSignature	    = memberSignature;
+		}
+
+		public      string      MemberName          {get;}
+		public      string      MemberSignature     {get;}
+	}
+}
+
+#endif  // NET
diff --git a/src/Java.Interop/Java.Interop/JniMethodSignatureAttribute.cs b/src/Java.Interop/Java.Interop/JniMethodSignatureAttribute.cs
new file mode 100644
index 000000000..3f1d9f9d1
--- /dev/null
+++ b/src/Java.Interop/Java.Interop/JniMethodSignatureAttribute.cs
@@ -0,0 +1,20 @@
+#nullable enable
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+#if NET
+
+namespace Java.Interop
+{
+	[AttributeUsage (AttributeTargets.Method, AllowMultiple = false)]
+	public sealed class JniMethodSignatureAttribute : JniMemberSignatureAttribute {
+
+		public JniMethodSignatureAttribute (string memberName, string memberSignature)
+			: base (memberName, memberSignature)
+		{
+		}
+	}
+}
+
+#endif  // NET
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
index 22055675b..66f7ccb6d 100644
--- a/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
+++ b/src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
@@ -251,11 +251,35 @@ IEnumerable<Type> CreateGetTypesForSimpleReferenceEnumerator (string jniSimpleRe
 				yield break;
 			}
 
+#if NET
+			public virtual void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
+			{
+				TryRegisterNativeMembers (nativeClass, type, methods);
+			}
+
+			protected bool TryRegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
+			{
+				AssertValid ();
+
+#pragma warning disable CS1717
+				methods = methods;
+#pragma warning restore CS1717
+
+				return TryLoadJniMarshalMethods (nativeClass, type, null) || TryRegisterNativeMembers (nativeClass, type, null, null);
+			}
+#endif  // NET
+
+#if NET
+			[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>)")]
+#endif  // NET
 			public virtual void RegisterNativeMembers (JniType nativeClass, Type type, string? methods)
 			{
 				TryRegisterNativeMembers (nativeClass, type, methods);
 			}
 
+#if NET
+			[Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan<char>)")]
+#endif  // NET
 			protected bool TryRegisterNativeMembers (JniType nativeClass, Type type, string? methods)
 			{
 				AssertValid ();
diff --git a/src/Java.Interop/Java.Interop/ManagedPeer.cs b/src/Java.Interop/Java.Interop/ManagedPeer.cs
index 5c0e033c3..560008bf3 100644
--- a/src/Java.Interop/Java.Interop/ManagedPeer.cs
+++ b/src/Java.Interop/Java.Interop/ManagedPeer.cs
@@ -182,7 +182,7 @@ delegate void RegisterMarshalMethod (IntPtr jnienv,
 				IntPtr n_nativeClass,
 				IntPtr n_assemblyQualifiedName,
 				IntPtr n_methods);
-		static void RegisterNativeMembers (
+		static unsafe void RegisterNativeMembers (
 				IntPtr jnienv,
 				IntPtr klass,
 				IntPtr n_nativeClass,
@@ -195,11 +195,25 @@ static void RegisterNativeMembers (
 				var nativeClass     = new JniType (ref r_nativeClass, JniObjectReferenceOptions.Copy);
 
 				var assemblyQualifiedName   = JniEnvironment.Strings.ToString (new JniObjectReference (n_assemblyQualifiedName));
-				var methods                 = JniEnvironment.Strings.ToString (new JniObjectReference (n_methods));
+				var type                    = Type.GetType (assemblyQualifiedName!, throwOnError: true)!;
+				var methodsRef              = new JniObjectReference (n_methods);
 
-				var type    = Type.GetType (assemblyQualifiedName!, throwOnError: true)!;
+#if NET
 
+				int methodsLength           = JniEnvironment.Strings.GetStringLength (methodsRef);
+				var methodsChars            = JniEnvironment.Strings.GetStringChars (methodsRef, null);
+				var methods                 = new ReadOnlySpan<char>(methodsChars, methodsLength);
+				try {
+					JniEnvironment.Runtime.TypeManager.RegisterNativeMembers (nativeClass, type, methods);
+				}
+				finally {
+					JniEnvironment.Strings.ReleaseStringChars (methodsRef, methodsChars);
+				}
+#else   // NET
+				var methods                 = JniEnvironment.Strings.ToString (methodsRef);
 				JniEnvironment.Runtime.TypeManager.RegisterNativeMembers (nativeClass, type, methods);
+#endif  // NET
+
 			}
 			catch (Exception e) when (JniEnvironment.Runtime.ExceptionShouldTransitionToJni (e)) {
 				Debug.WriteLine (e.ToString ());
diff --git a/src/Java.Runtime.Environment/Java.Interop/JreRuntime.cs b/src/Java.Runtime.Environment/Java.Interop/JreRuntime.cs
index dcfd35289..45b4e77bd 100644
--- a/src/Java.Runtime.Environment/Java.Interop/JreRuntime.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/JreRuntime.cs
@@ -39,7 +39,7 @@ public JreRuntimeOptions ()
 			JniVersion  = JniVersion.v1_2;
 			ClassPath   = new Collection<string> () {
 				Path.Combine (
-					Path.GetDirectoryName (typeof (JreRuntimeOptions).Assembly.Location),
+					Path.GetDirectoryName (typeof (JreRuntimeOptions).Assembly.Location) ?? throw new NotSupportedException (),
 					"java-interop.jar"),
 			};
 		}
@@ -73,7 +73,7 @@ public class JreRuntime : JniRuntime
 		static JreRuntime ()
 		{
 			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
-				var baseDir = Path.GetDirectoryName (typeof (JreRuntime).Assembly.Location);
+				var baseDir = Path.GetDirectoryName (typeof (JreRuntime).Assembly.Location) ?? throw new NotSupportedException ();
 				var newDir  = Path.Combine (baseDir, Environment.Is64BitProcess ? "win-x64" : "win-x86");
 				NativeMethods.AddDllDirectory (newDir);
 			}
@@ -89,6 +89,10 @@ static unsafe JreRuntimeOptions CreateJreVM (JreRuntimeOptions builder)
 			if (builder == null)
 				throw new ArgumentNullException ("builder");
 
+#if NET
+			builder.TypeManager     ??= new JreTypeManager ();
+#endif  // NET
+
 			bool onMono = Type.GetType ("Mono.Runtime", throwOnError: false) != null;
 			if (onMono) {
 				builder.ValueManager            = builder.ValueManager              ?? new MonoRuntimeValueManager ();
@@ -106,7 +110,7 @@ static unsafe JreRuntimeOptions CreateJreVM (JreRuntimeOptions builder)
 				IntPtr errorPtr = IntPtr.Zero;
 				int r = NativeMethods.java_interop_jvm_load_with_error_message (builder.JvmLibraryPath!, out errorPtr);
 				if (r != 0) {
-					string error = Marshal.PtrToStringAnsi (errorPtr);
+					string? error = Marshal.PtrToStringAnsi (errorPtr);
 					NativeMethods.java_interop_free (errorPtr);
 					throw new Exception ($"Could not load JVM path `{builder.JvmLibraryPath}`: {error} ({r})!");
 				}
@@ -151,7 +155,7 @@ internal protected JreRuntime (JreRuntimeOptions builder)
 		{
 		}
 
-		public override string GetCurrentManagedThreadName ()
+		public override string? GetCurrentManagedThreadName ()
 		{
 			return Thread.CurrentThread.Name;
 		}
diff --git a/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs b/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs
new file mode 100644
index 000000000..7f3e0763c
--- /dev/null
+++ b/src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs
@@ -0,0 +1,110 @@
+#if NET
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+
+namespace Java.Interop {
+
+	using JniMethodMap = Dictionary<(string Name, string Signature), MethodInfo>;
+
+	public class JreTypeManager : JniRuntime.JniTypeManager {
+
+		public override void RegisterNativeMembers (JniType nativeClass, Type type, ReadOnlySpan<char> methods)
+		{
+			if (base.TryRegisterNativeMembers (nativeClass, type, methods)) {
+				return;
+			}
+
+			var toRegister  = new JniMethodMap ();
+
+			AddInterfaceMethods (toRegister, type);
+			AddClassMethods (toRegister, type);
+
+			// ignore methods…
+
+			var builder         = Runtime.MarshalMemberBuilder;
+			var registrations   = new List<JniNativeMethodRegistration>(toRegister.Count);
+
+			while (!methods.IsEmpty) {
+				int newLineIndex = methods.IndexOf ('\n');
+				if (newLineIndex < 0) {
+					break;
+				}
+				var line = methods.Slice (0, newLineIndex);
+				methods = methods.Slice (newLineIndex+1);
+				GetNameAndSignature (line, out var name, out var signature);
+
+				if (!toRegister.TryGetValue ((name, signature), out var method)) {
+					continue;
+				}
+				var marshaler   = builder.CreateMarshalToManagedExpression (method).Compile ();
+				if (marshaler == null) {
+					throw new NotSupportedException ($"Could not create JNI marshal method for {method!.DeclaringType?.FullName}.{method!.Name}({signature})");
+				}
+				registrations.Add (new JniNativeMethodRegistration (name, signature, marshaler!));
+			}
+
+			nativeClass.RegisterNativeMethods (registrations.ToArray ());
+		}
+
+		static void AddInterfaceMethods (JniMethodMap toRegister, Type type)
+		{
+			foreach (var iface in type.GetInterfaces ()) {
+				var ifaceSignature = iface.GetCustomAttribute<JniTypeSignatureAttribute> ();
+				if (ifaceSignature == null || string.IsNullOrEmpty (ifaceSignature.SimpleReference)) {
+					continue;
+				}
+				var map = type.GetInterfaceMap (iface);
+				for (int i = 0; i < map.InterfaceMethods.Length; ++i) {
+					AddJniMethod (toRegister, map.InterfaceMethods [i], map.TargetMethods [i]);
+				}
+			}
+		}
+
+		static void AddJniMethod (JniMethodMap toRegister, MethodInfo declaringMethod, MethodInfo? targetMethod = null)
+		{
+			var signature = declaringMethod.GetCustomAttribute<JniMethodSignatureAttribute>(inherit: true);
+			if (signature == null || string.IsNullOrEmpty (signature.MemberName)) {
+				return;
+			}
+			toRegister [("n_" + signature.MemberName, signature.MemberSignature)]   = targetMethod ?? declaringMethod;
+		}
+
+		static void AddClassMethods (JniMethodMap toRegister, Type type)
+		{
+			const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+			foreach (var method in type.GetMethods (Flags)) {
+				AddJniMethod (toRegister, method);
+			}
+			foreach (var property in type.GetProperties (Flags)) {
+				var get = property.GetGetMethod ();
+				if (get != null) {
+					AddJniMethod (toRegister, get);
+				}
+				var set = property.GetSetMethod ();
+				if (set != null) {
+					AddJniMethod (toRegister, set);
+				}
+			}
+		}
+
+		static void GetNameAndSignature (ReadOnlySpan<char> line, out string name, out string signature)
+		{
+			int colon   = line.IndexOf (':');
+			name        = new string (line.Slice (0, colon));
+			line        = line.Slice (colon+1);
+			colon       = line.IndexOf (':');
+			signature   = new string (line.Slice (0, colon));
+		}
+	}
+}
+
+#endif  // NET
diff --git a/src/Java.Runtime.Environment/Java.Interop/ManagedObjectReferenceManager.cs b/src/Java.Runtime.Environment/Java.Interop/ManagedObjectReferenceManager.cs
index 700c6f617..700dc3b6a 100644
--- a/src/Java.Runtime.Environment/Java.Interop/ManagedObjectReferenceManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/ManagedObjectReferenceManager.cs
@@ -63,7 +63,7 @@ public override void OnSetRuntime (JniRuntime runtime)
 			base.OnSetRuntime (runtime);
 		}
 
-		static TextWriter? CreateTextWriter (string path)
+		static TextWriter CreateTextWriter (string path)
 		{
 			return new StreamWriter (path, append: false, encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false));
 		}
@@ -122,7 +122,7 @@ public override void WriteGlobalReferenceLine (string format, params object?[]?
 		{
 			if (grefLog == null)
 				return;
-			grefLog.WriteLine (format, args);
+			grefLog.WriteLine (format, args!);
 			grefLog.Flush ();
 		}
 
diff --git a/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
index 1dcb12220..7ff510a7a 100644
--- a/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
@@ -66,7 +66,7 @@ public override void AddPeer (IJavaPeerable value)
 			}
 			int key = value.JniIdentityHashCode;
 			lock (RegisteredInstances) {
-				List<IJavaPeerable> peers;
+				List<IJavaPeerable>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers)) {
 					peers = new List<IJavaPeerable> () {
 						value,
@@ -124,7 +124,7 @@ void WarnNotReplacing (int key, IJavaPeerable ignoreValue, IJavaPeerable keepVal
 			int key = GetJniIdentityHashCode (reference);
 
 			lock (RegisteredInstances) {
-				List<IJavaPeerable> peers;
+				List<IJavaPeerable>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers))
 					return null;
 
@@ -149,7 +149,7 @@ public override void RemovePeer (IJavaPeerable value)
 
 			int key = value.JniIdentityHashCode;
 			lock (RegisteredInstances) {
-				List<IJavaPeerable> peers;
+				List<IJavaPeerable>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers))
 					return;
 
@@ -211,7 +211,7 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 						reference,
 						runtime.ValueManager.GetJniIdentityHashCode (reference).ToString ("x"),
 						JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
-						cinfo.DeclaringType.FullName);
+						cinfo.DeclaringType?.FullName);
 				Debug.WriteLine (m);
 
 				throw new NotSupportedException (m, e);
diff --git a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeObjectReferenceManager.cs b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeObjectReferenceManager.cs
index 68025e066..82b4961ae 100644
--- a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeObjectReferenceManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeObjectReferenceManager.cs
@@ -124,7 +124,7 @@ public override void WriteGlobalReferenceLine (string format, params object?[]?
 		{
 			if (!LogGlobalReferenceMessages)
 				return;
-			NativeMethods.java_interop_gc_bridge_gref_log_message (bridge, 0, string.Format (format, args));
+			NativeMethods.java_interop_gc_bridge_gref_log_message (bridge, 0, string.Format (format, args!));
 			NativeMethods.java_interop_gc_bridge_gref_log_message (bridge, 0, "\n");
 		}
 
diff --git a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
index 1f7cea114..223d03f4b 100644
--- a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
+++ b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
@@ -81,7 +81,7 @@ protected override void Dispose (bool disposing)
 			lock (RegisteredInstances) {
 				foreach (var o in RegisteredInstances.Values) {
 					foreach (var r in o) {
-						IJavaPeerable t;
+						IJavaPeerable? t;
 						if (!r.TryGetTarget (out t))
 							continue;
 						t.Dispose ();
@@ -134,7 +134,7 @@ public override void AddPeer (IJavaPeerable value)
 			}
 			int key = value.JniIdentityHashCode;
 			lock (RegisteredInstances) {
-				List<WeakReference<IJavaPeerable>> peers;
+				List<WeakReference<IJavaPeerable>>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers)) {
 					peers = new List<WeakReference<IJavaPeerable>> () {
 						new WeakReference<IJavaPeerable>(value, trackResurrection: true),
@@ -145,7 +145,7 @@ public override void AddPeer (IJavaPeerable value)
 
 				for (int i = peers.Count - 1; i >= 0; i--) {
 					var wp = peers [i];
-					IJavaPeerable   p;
+					IJavaPeerable?  p;
 					if (!wp.TryGetTarget (out p)) {
 						// Peer was collected
 						peers.RemoveAt (i);
@@ -197,13 +197,13 @@ public override void RemovePeer (IJavaPeerable value)
 
 			int key = value.JniIdentityHashCode;
 			lock (RegisteredInstances) {
-				List<WeakReference<IJavaPeerable>> peers;
+				List<WeakReference<IJavaPeerable>>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers))
 					return;
 
 				for (int i = peers.Count - 1; i >= 0; i--) {
 					var wp = peers [i];
-					IJavaPeerable   p;
+					IJavaPeerable?  p;
 					if (!wp.TryGetTarget (out p)) {
 						// Peer was collected
 						peers.RemoveAt (i);
@@ -229,13 +229,13 @@ public override void RemovePeer (IJavaPeerable value)
 			int key = GetJniIdentityHashCode (reference);
 
 			lock (RegisteredInstances) {
-				List<WeakReference<IJavaPeerable>> peers;
+				List<WeakReference<IJavaPeerable>>? peers;
 				if (!RegisteredInstances.TryGetValue (key, out peers))
 					return null;
 
 				for (int i = peers.Count - 1; i >= 0; i--) {
 					var wp = peers [i];
-					IJavaPeerable   p;
+					IJavaPeerable?  p;
 					if (!wp.TryGetTarget (out p)) {
 						// Peer was collected
 						peers.RemoveAt (i);
@@ -269,7 +269,7 @@ public override void ActivatePeer (IJavaPeerable? self, JniObjectReference refer
 						reference,
 						runtime.ValueManager.GetJniIdentityHashCode (reference).ToString ("x"),
 						JniEnvironment.Types.GetJniTypeNameFromInstance (reference),
-						cinfo.DeclaringType.FullName);
+						cinfo.DeclaringType?.FullName);
 				Debug.WriteLine (m);
 
 				throw new NotSupportedException (m, e);
diff --git a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
index 1ff8f04bf..69a35ba98 100644
--- a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
+++ b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -17,7 +17,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Java.Interop\Java.Interop.csproj" />
-    <ProjectReference Include="..\..\src\java-interop\java-interop.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\Java.Interop.Export\Java.Interop.Export.csproj" />
+    <ProjectReference Include="..\java-interop\java-interop.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <Import Project="Java.Runtime.Environment.targets" />
diff --git a/tests/Java.Base-Tests/Java.Base-Tests.csproj b/tests/Java.Base-Tests/Java.Base-Tests.csproj
new file mode 100644
index 000000000..6bc86be15
--- /dev/null
+++ b/tests/Java.Base-Tests/Java.Base-Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <RootNamespace>Java.BaseTests</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>$(TestOutputFullPath)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Java.Base\Java.Base.csproj" />
+    <ProjectReference Include="..\..\src\Java.Runtime.Environment\Java.Runtime.Environment.csproj" />
+    <ProjectReference Include="..\TestJVM\TestJVM.csproj" />
+  </ItemGroup>
+
+  <Import Project="Java.Base-Tests.targets" />
+
+</Project>
diff --git a/tests/Java.Base-Tests/Java.Base-Tests.targets b/tests/Java.Base-Tests/Java.Base-Tests.targets
new file mode 100644
index 000000000..f05455f59
--- /dev/null
+++ b/tests/Java.Base-Tests/Java.Base-Tests.targets
@@ -0,0 +1,49 @@
+<Project>
+
+  <ItemGroup>
+    <_BuildJavaBaseTestsJarInputs Include="$(TargetPath)" />
+    <_BuildJavaBaseTestsJarInputs Include="$(MSBuildThisFileFullPath)" />
+    <_BuildJavaBaseTestsJarInputs Include="$(MSBuildThisFileFullPath)" />
+    <_BuildJavaBaseTestsJarInputs Include="java\**\*.java" />
+  </ItemGroup>
+
+  <Target Name="_CreateJavaCallableWrappers"
+      Condition=" '$(TargetPath)' != '' "
+      AfterTargets="Build"
+      Inputs="@(_BuildJavaBaseTestsJarInputs)"
+      Outputs="$(IntermediateOutputPath)java\.stamp">
+    <RemoveDir Directories="$(IntermediateOutputPath)java" />
+    <MakeDir Directories="$(IntermediateOutputPath)java" />
+    <ItemGroup>
+      <!-- I can't find a good way to trim the trailing `\`, so append with `.` so we can sanely quote for $(_Libpath) -->
+      <_RefAsmDirs Include="@(ReferencePathWithRefAssemblies->'%(RootDir)%(Directory).'->Distinct())" />
+    </ItemGroup>
+    <PropertyGroup>
+      <_JcwGen>"$(ToolOutputFullPath)/jcw-gen.dll"</_JcwGen>
+      <_Target>--codegen-target JavaInterop1</_Target>
+      <_Output>-o "$(IntermediateOutputPath)/java"</_Output>
+      <_Libpath>@(_RefAsmDirs->'-L "%(Identity)"', ' ')</_Libpath>
+    </PropertyGroup>
+    <Exec Command="$(DotnetToolPath) $(_JcwGen) &quot;$(TargetPath)&quot; $(_Target) $(_Output) $(_Libpath)" />
+    <Touch Files="$(IntermediateOutputPath)java\.stamp" AlwaysCreate="True" />
+  </Target>
+
+  <ItemGroup>
+    <_JcwSource Include="$(IntermediateOutputPath)java\**\*.java;java\**\*.java" />
+  </ItemGroup>
+
+  <Target Name="_BuildJavaBaseTestsJar"
+      Condition=" '$(TargetPath)' != '' "
+      AfterTargets="_CreateJavaCallableWrappers"
+      Inputs="$(IntermediateOutputPath)java\.stamp;@(_JcwSource)"
+      Outputs="$(OutputPath)java.base-tests.jar">
+    <RemoveDir Directories="$(IntermediateOutputPath)classes" />
+    <MakeDir Directories="$(IntermediateOutputPath)classes" />
+    <ItemGroup>
+      <_JcwSourceReal Include="$(IntermediateOutputPath)java\**\*.java;java\**\*.java" />
+    </ItemGroup>
+    <Exec Command="&quot;$(JavaCPath)&quot; $(_JavacSourceOptions) -d &quot;$(IntermediateOutputPath)classes&quot; -classpath &quot;$(OutputPath)/java-interop.jar&quot; @(_JcwSourceReal->'%(Identity)', ' ')" />
+    <Exec Command="&quot;$(JarPath)&quot; cf &quot;$(OutputPath)java.base-tests.jar&quot; -C &quot;$(IntermediateOutputPath)classes&quot; ." />
+  </Target>
+
+</Project>
diff --git a/tests/Java.Base-Tests/Java.Base/JavaToManagedTests.cs b/tests/Java.Base-Tests/Java.Base/JavaToManagedTests.cs
new file mode 100644
index 000000000..72608f5e6
--- /dev/null
+++ b/tests/Java.Base-Tests/Java.Base/JavaToManagedTests.cs
@@ -0,0 +1,51 @@
+using System;
+
+using Java.Interop;
+
+using NUnit.Framework;
+
+namespace Java.BaseTests {
+
+	[TestFixture]
+	public class JavaToManagedTests : JavaVMFixture {
+
+		[Test]
+		public void InterfaceMethod ()
+		{
+			var invoked = false;
+			var r       = new MyRunnable (() => invoked = true);
+			JavaInvoker.Run (r);
+			Assert.IsTrue (invoked);
+			r.Dispose ();
+		}
+	}
+
+	class JavaInvoker : JavaObject {
+		internal const string JniTypeName = "com/microsoft/java_base_tests/Invoker";
+
+		static readonly JniPeerMembers _members = new JniPeerMembers (JniTypeName, typeof (JavaInvoker));
+
+		public static unsafe void Run (Java.Lang.IRunnable r)
+		{
+			JniArgumentValue* args = stackalloc JniArgumentValue [1];
+			args [0] = new JniArgumentValue (r);
+			_members.StaticMethods.InvokeVoidMethod ("run.(Ljava/lang/Runnable;)V", args);
+		}
+	}
+
+	[JniTypeSignature ("example/MyRunnable")]
+	class MyRunnable : Java.Lang.Object, Java.Lang.IRunnable {
+
+		Action action;
+
+		public MyRunnable (Action action)
+		{
+			this.action = action;
+		}
+
+		public void Run ()
+		{
+			action ();
+		}
+	}
+}
diff --git a/tests/Java.Base-Tests/Java.Base/JavaVMFixture.Partial.cs b/tests/Java.Base-Tests/Java.Base/JavaVMFixture.Partial.cs
new file mode 100644
index 000000000..fb22b5531
--- /dev/null
+++ b/tests/Java.Base-Tests/Java.Base/JavaVMFixture.Partial.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Reflection;
+
+using Java.Interop;
+
+namespace Java.BaseTests {
+
+public abstract partial class JavaVMFixture {
+	static JavaVMFixture ()
+	{
+		CreateJavaVM ();
+	}
+	static partial void CreateJavaVM ();
+	protected JavaVMFixture ()
+	{
+	}
+}
+
+}
\ No newline at end of file
diff --git a/tests/Java.Base-Tests/Java.Base/JavaVMFixture.cs b/tests/Java.Base-Tests/Java.Base/JavaVMFixture.cs
new file mode 100644
index 000000000..f1729d6cb
--- /dev/null
+++ b/tests/Java.Base-Tests/Java.Base/JavaVMFixture.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Diagnostics;
+using System.Linq;
+
+using Java.Interop;
+
+using Java.InteropTests;
+
+namespace Java.BaseTests {
+
+	partial class JavaVMFixture {
+
+		static partial void CreateJavaVM ()
+		{
+			var c = new TestJVM (
+					jars:           new[]{ "java.base-tests.jar" },
+					typeMappings:   new Dictionary<string, Type> () {
+						["example/MyRunnable"]      = typeof (MyRunnable),
+						[JavaInvoker.JniTypeName]   = typeof (JavaInvoker),
+					}
+			);
+			JniRuntime.SetCurrent (c);
+		}
+	}
+}
diff --git a/tests/Java.Base-Tests/java/com/microsoft/java_base_tests/Invoker.java b/tests/Java.Base-Tests/java/com/microsoft/java_base_tests/Invoker.java
new file mode 100644
index 000000000..7cf4cbc73
--- /dev/null
+++ b/tests/Java.Base-Tests/java/com/microsoft/java_base_tests/Invoker.java
@@ -0,0 +1,8 @@
+package com.microsoft.java_base_tests;
+
+public class Invoker {
+
+	public static void run(Runnable r) {
+		r.run();
+	}
+}
diff --git a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs
index fe6b4081b..fa846a723 100644
--- a/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs
+++ b/tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs
@@ -439,16 +439,18 @@ extends java.lang.Object
 	public ExportsConstructors ()
 	{
 		super ();
-		if (getClass () == ExportsConstructors.class)
+		if (getClass () == ExportsConstructors.class) {
 			mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests"", """", this, new java.lang.Object[] {  });
+		}
 	}
 
 
 	public ExportsConstructors (int p0)
 	{
 		super (p0);
-		if (getClass () == ExportsConstructors.class)
+		if (getClass () == ExportsConstructors.class) {
 			mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests"", """", this, new java.lang.Object[] { p0 });
+		}
 	}
 
 	private java.util.ArrayList refList;
@@ -493,24 +495,27 @@ extends java.lang.Object
 	public ExportsThrowsConstructors () throws java.lang.Throwable
 	{
 		super ();
-		if (getClass () == ExportsThrowsConstructors.class)
+		if (getClass () == ExportsThrowsConstructors.class) {
 			mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests"", """", this, new java.lang.Object[] {  });
+		}
 	}
 
 
 	public ExportsThrowsConstructors (int p0) throws java.lang.Throwable
 	{
 		super (p0);
-		if (getClass () == ExportsThrowsConstructors.class)
+		if (getClass () == ExportsThrowsConstructors.class) {
 			mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests"", """", this, new java.lang.Object[] { p0 });
+		}
 	}
 
 
 	public ExportsThrowsConstructors (java.lang.String p0)
 	{
 		super (p0);
-		if (getClass () == ExportsThrowsConstructors.class)
+		if (getClass () == ExportsThrowsConstructors.class) {
 			mono.android.TypeManager.Activate (""Xamarin.Android.ToolsTests.ExportsThrowsConstructors, Java.Interop.Tools.JavaCallableWrappers-Tests"", """", this, new java.lang.Object[] { p0 });
+		}
 	}
 
 	private java.util.ArrayList refList;
diff --git a/tests/TestJVM/TestJVM.cs b/tests/TestJVM/TestJVM.cs
index 5ef58d9c4..4ac66ca63 100644
--- a/tests/TestJVM/TestJVM.cs
+++ b/tests/TestJVM/TestJVM.cs
@@ -30,7 +30,7 @@ static JreRuntimeOptions CreateBuilder (string[] jars, Assembly caller)
 					builder.ClassPath.Add (Path.Combine (dir, jar));
 			}
 			builder.AddOption ("-Xcheck:jni");
-			builder.TypeManager                 = new JreTypeManager ();
+			builder.TypeManager                 = new TestTypeManager ();
 
 			return builder;
 		}
@@ -97,7 +97,13 @@ public TestJVM (string[] jars = null, Dictionary<string, Type> typeMappings = nu
 			this.typeMappings = typeMappings;
 		}
 
-		class JreTypeManager : JniTypeManager {
+		class TestTypeManager :
+#if NET
+			JreTypeManager
+#else   // !NET
+			JniTypeManager
+#endif  // !NET
+		{
 
 			protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpleReference)
 			{
diff --git a/tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs b/tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs
index 55c051cc6..8de413537 100644
--- a/tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs
+++ b/tests/generator-Tests/Integration-Tests/BaseGeneratorTest.cs
@@ -125,9 +125,11 @@ protected void RunAllTargets (string outputRelativePath, string apiDescriptionFi
 		{
 			Run (CodeGenerationTarget.XamarinAndroid,   Path.Combine ("out", outputRelativePath),       apiDescriptionFile,     Path.Combine ("expected", expectedRelativePath),        additionalSupportPaths, enumFieldsMapFile, enumMethodMapFile, metadataFile);
 			Run (CodeGenerationTarget.XAJavaInterop1,   Path.Combine ("out.xaji", outputRelativePath),  apiDescriptionFile,     Path.Combine ("expected.xaji", expectedRelativePath),     additionalSupportPaths, enumFieldsMapFile, enumMethodMapFile, metadataFile);
+#if NET
 			if (TryJavaInterop1) {
 				Run (CodeGenerationTarget.JavaInterop1,     Path.Combine ("out.ji", outputRelativePath),    apiDescriptionFile,     Path.Combine ("expected.ji", expectedRelativePath),     additionalSupportPaths, enumFieldsMapFile, enumMethodMapFile, metadataFile);
 			}
+#endif  // NET
 		}
 
 		protected string FullPath (string path)
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
index 09e6e4837..3c1b1f871 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt
@@ -113,13 +113,16 @@ public partial class MyClass {
 
 	public abstract int AbstractCount {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_AbstractCount' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("get_AbstractCount", "()I")]
 		get; 
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_AbstractCount' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("set_AbstractCount", "(I)V")]
 		set; 
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='GetCountForKey' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
+	[global::Java.Interop.JniMethodSignature ("GetCountForKey", "(Ljava/lang/String;)I")]
 	public virtual unsafe int GetCountForKey (string? key)
 	{
 		const string __id = "GetCountForKey.(Ljava/lang/String;)I";
@@ -135,6 +138,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Key' and count(parameter)=0]"
+	[global::Java.Interop.JniMethodSignature ("Key", "()Ljava/lang/String;")]
 	public virtual unsafe string? Key ()
 	{
 		const string __id = "Key.()Ljava/lang/String;";
@@ -146,6 +150,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='StaticMethod' and count(parameter)=0]"
+	[global::Java.Interop.JniMethodSignature ("StaticMethod", "()V")]
 	public static unsafe void StaticMethod ()
 	{
 		const string __id = "StaticMethod.()V";
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt
index 2fbd55975..a1c84a51b 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt
@@ -2,9 +2,11 @@
 [global::Java.Interop.JniTypeSignature ("java/code/AnimatorListener", GenerateJavaPeer=false)]
 public partial interface AnimatorListener : IJavaPeerable {
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='AnimatorListener']/method[@name='OnAnimationEnd' and count(parameter)=1 and parameter[1][@type='int']]"
+	[global::Java.Interop.JniMethodSignature ("OnAnimationEnd", "(I)Z")]
 	bool OnAnimationEnd (int param1);
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='AnimatorListener']/method[@name='OnAnimationEnd' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='int']]"
+	[global::Java.Interop.JniMethodSignature ("OnAnimationEnd", "(II)Z")]
 	bool OnAnimationEnd (int param1, int param2);
 
 }
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
index 79c6ea479..03ba73bfe 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt
@@ -5,25 +5,31 @@ public partial interface IMyInterface : IJavaPeerable {
 
 	int Count {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Count' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("get_Count", "()I")]
 		get; 
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Count' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("set_Count", "(I)V")]
 		set; 
 	}
 
 	string? Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("get_Key", "()Ljava/lang/String;")]
 		get; 
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
+		[global::Java.Interop.JniMethodSignature ("set_Key", "(Ljava/lang/String;)V")]
 		set; 
 	}
 
 	int AbstractCount {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_AbstractCount' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("get_AbstractCount", "()I")]
 		get; 
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_AbstractCount' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("set_AbstractCount", "(I)V")]
 		set; 
 	}
 
@@ -50,15 +56,19 @@ public partial interface IMyInterface : IJavaPeerable {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='GetCountForKey' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
+	[global::Java.Interop.JniMethodSignature ("GetCountForKey", "(Ljava/lang/String;)I")]
 	int GetCountForKey (string? key);
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='Key' and count(parameter)=0]"
+	[global::Java.Interop.JniMethodSignature ("Key", "()Ljava/lang/String;")]
 	string? Key ();
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='AbstractMethod' and count(parameter)=0]"
+	[global::Java.Interop.JniMethodSignature ("AbstractMethod", "()V")]
 	void AbstractMethod ();
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='StaticMethod' and count(parameter)=0]"
+	[global::Java.Interop.JniMethodSignature ("StaticMethod", "()V")]
 	public static unsafe void StaticMethod ()
 	{
 		const string __id = "StaticMethod.()V";
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt
index b2f007f96..284323bac 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt
@@ -8,6 +8,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='uint[]']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "([I)[I")]
 	public unsafe Java.Interop.JavaInt32Array? Echo (uint[]? value)
 	{
 		const string __id = "Echo.([I)[I";
@@ -26,6 +27,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ushort[]']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "([S)[S")]
 	public unsafe Java.Interop.JavaInt16Array? Echo (ushort[]? value)
 	{
 		const string __id = "Echo.([S)[S";
@@ -44,6 +46,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ulong[]']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "([J)[J")]
 	public unsafe Java.Interop.JavaInt64Array? Echo (ulong[]? value)
 	{
 		const string __id = "Echo.([J)[J";
@@ -62,6 +65,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ubyte[]']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "([B)[B")]
 	public unsafe Java.Interop.JavaSByteArray? Echo (byte[]? value)
 	{
 		const string __id = "Echo.([B)[B";
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt
index 37c4a554a..ac069c810 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt
@@ -8,6 +8,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='uint']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "(I)I")]
 	public unsafe uint Echo (uint value)
 	{
 		const string __id = "Echo.(I)I";
@@ -21,6 +22,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ushort']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "(S)S")]
 	public unsafe ushort Echo (ushort value)
 	{
 		const string __id = "Echo.(S)S";
@@ -34,6 +36,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ulong']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "(J)J")]
 	public unsafe ulong Echo (ulong value)
 	{
 		const string __id = "Echo.(J)J";
@@ -47,6 +50,7 @@ public partial class MyClass {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ubyte']]"
+	[global::Java.Interop.JniMethodSignature ("Echo", "(B)B")]
 	public unsafe byte Echo (byte value)
 	{
 		const string __id = "Echo.(B)B";
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithCharSequenceArrays.txt
index cfc271d21..9aa270aee 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithCharSequenceArrays.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteMethodWithCharSequenceArrays.txt
@@ -14,6 +14,7 @@ public partial class MyClass : Java.Lang.Object {
 	}
 
 	// Metadata.xml XPath method reference: path="/api/package[@name='com.example']/class[@name='MyClass']/method[@name='echo' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence[]']]"
+	[global::Java.Interop.JniMethodSignature ("echo", "([Ljava/lang/CharSequence;)[Ljava/lang/CharSequence;")]
 	public virtual unsafe Java.Interop.JavaObjectArray<Java.Lang.ICharSequence>? Echo (Java.Interop.JavaObjectArray<Java.Lang.ICharSequence>? messages)
 	{
 		const string __id = "echo.([Ljava/lang/CharSequence;)[Ljava/lang/CharSequence;";
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt
index d6cfe01eb..dc5184f18 100644
--- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt
+++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt
@@ -15,7 +15,6 @@ public partial class MyClass {
 
 			try {
 				_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 			} finally {
 				GC.KeepAlive (value);
 			}
diff --git a/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs b/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs
index 6bb3b039d..2df83f59e 100644
--- a/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs
+++ b/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs
@@ -44,7 +44,7 @@ public void WriteInterfaceDefaultMethod ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (null, null, null));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteInterfaceDefaultMethod)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteInterfaceDefaultMethod), writer.ToString ());
 		}
 
 		[Test]
@@ -66,7 +66,7 @@ public void WriteInterfaceRedeclaredDefaultMethod ()
 			generator.WriteType (iface2, string.Empty, new GenerationInfo (null, null, null));
 
 			// IMyInterface2 should generate the method as abstract, not a default method
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteInterfaceRedeclaredDefaultMethod)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteInterfaceRedeclaredDefaultMethod), writer.ToString ());
 		}
 
 		[Test]
@@ -85,7 +85,7 @@ public void WriteInterfaceDefaultProperty ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (null, null, null));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteInterfaceDefaultProperty)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteInterfaceDefaultProperty), writer.ToString ());
 		}
 
 		[Test]
@@ -104,7 +104,7 @@ public void WriteInterfaceDefaultPropertyGetterOnly ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (null, null, null));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteInterfaceDefaultPropertyGetterOnly)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteInterfaceDefaultPropertyGetterOnly), writer.ToString ());
 		}
 
 
@@ -123,7 +123,7 @@ public void WriteDefaultInterfaceMethodInvoker ()
 			generator.WriteType (iface, string.Empty, new GenerationInfo (null, null, null));
 			generator.Context.ContextTypes.Pop ();
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteDefaultInterfaceMethodInvoker)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteDefaultInterfaceMethodInvoker), writer.ToString ());
 		}
 
 		[Test]
@@ -205,7 +205,7 @@ public void WriteStaticInterfaceMethod ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteStaticInterfaceMethod)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteStaticInterfaceMethod), writer.ToString ());
 		}
 
 		[Test]
@@ -226,7 +226,7 @@ public void WriteStaticInterfaceProperty ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (null, null, null));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteStaticInterfaceProperty)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteStaticInterfaceProperty), writer.ToString ());
 		}
 
 		readonly string nested_interface_api = @"<api>
@@ -267,7 +267,7 @@ public void WriteUnnestedInterfaceTypes ()
 
 			generator.WriteType (parent_iface, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteUnnestedInterfaceTypes)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteUnnestedInterfaceTypes), writer.ToString ());
 		}
 
 		[Test]
@@ -285,7 +285,7 @@ public void WriteNestedInterfaceTypes ()
 
 			generator.WriteType (parent_iface, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteNestedInterfaceTypes)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteNestedInterfaceTypes), writer.ToString ());
 		}
 
 		[Test]
@@ -303,7 +303,7 @@ public void WriteNestedInterfaceClass ()
 
 			generator.WriteType (parent_iface, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteNestedInterfaceClass)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteNestedInterfaceClass), writer.ToString ());
 		}
 
 		[Test]
@@ -363,7 +363,7 @@ public void ObsoleteInterfaceAlternativeClass ()
 
 			generator.WriteType (iface, string.Empty, new GenerationInfo (string.Empty, string.Empty, "MyAssembly"));
 
-			Assert.AreEqual (GetTargetedExpected (nameof (ObsoleteInterfaceAlternativeClass)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (ObsoleteInterfaceAlternativeClass), writer.ToString ());
 		}
 
 		[Test]
@@ -488,7 +488,7 @@ public void WriteInterfaceFieldAsDimProperty ()
 
 			var generated = writer.ToString ();
 
-			Assert.AreEqual (GetTargetedExpected (nameof (WriteInterfaceFieldAsDimProperty)), writer.ToString ().NormalizeLineEndings ());
+			AssertTargetedExpected (nameof (WriteInterfaceFieldAsDimProperty), writer.ToString ());
 		}
 	}
 }
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
index 5a7b398d4..e3df45939 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs
@@ -20,6 +20,7 @@ protected BasePublicClass (ref JniObjectReference reference, JniObjectReferenceO
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='BasePublicClass']/method[@name='baseMethod' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("baseMethod", "()V")]
 		public virtual unsafe void BaseMethod ()
 		{
 			const string __id = "baseMethod.()V";
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
index d92029e62..22c13a9e7 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs
@@ -36,6 +36,7 @@ public unsafe ExtendPublicClass () : base (ref *InvalidJniObjectReference, JniOb
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='ExtendPublicClass']/method[@name='foo' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("foo", "()V")]
 		public virtual unsafe void Foo ()
 		{
 			const string __id = "foo.()V";
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
index 0a17ac6e0..b2018ed52 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs
@@ -8,9 +8,11 @@ namespace Xamarin.Test {
 	[global::Java.Interop.JniTypeSignature ("xamarin/test/ExtendedInterface", GenerateJavaPeer=false)]
 	public partial interface IExtendedInterface : IJavaPeerable {
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='ExtendedInterface']/method[@name='extendedMethod' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("extendedMethod", "()V")]
 		void ExtendedMethod ();
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='BaseInterface']/method[@name='baseMethod' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("baseMethod", "()V")]
 		void BaseMethod ();
 
 	}
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
index 929dbc2f1..cdeabf00a 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs
@@ -11,6 +11,7 @@ public partial class PublicClass : global::Java.Lang.Object {
 		[global::Java.Interop.JniTypeSignature ("xamarin/test/PublicClass$ProtectedInterface", GenerateJavaPeer=false)]
 		protected internal partial interface IProtectedInterface : IJavaPeerable {
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='PublicClass.ProtectedInterface']/method[@name='foo' and count(parameter)=0]"
+			[global::Java.Interop.JniMethodSignature ("foo", "()V")]
 			void Foo ();
 
 		}
@@ -44,6 +45,7 @@ public unsafe PublicClass () : base (ref *InvalidJniObjectReference, JniObjectRe
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicClass']/method[@name='foo' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("foo", "()V")]
 		public virtual unsafe void Foo ()
 		{
 			const string __id = "foo.()V";
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs
index 6683b1d57..6e6e15b7e 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs
@@ -20,6 +20,7 @@ internal PublicFinalClass (ref JniObjectReference reference, JniObjectReferenceO
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']/method[@name='publicMethod' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("publicMethod", "()V")]
 		public unsafe void PublicMethod ()
 		{
 			const string __id = "publicMethod.()V";
@@ -30,6 +31,7 @@ public unsafe void PublicMethod ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PackageClassB']/method[@name='packageMethodB' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("packageMethodB", "()V")]
 		public unsafe void PackageMethodB ()
 		{
 			const string __id = "packageMethodB.()V";
@@ -40,6 +42,7 @@ public unsafe void PackageMethodB ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PackageClassA']/method[@name='packageMethodA' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("packageMethodA", "()V")]
 		public unsafe void PackageMethodA ()
 		{
 			const string __id = "packageMethodA.()V";
diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs
index f1a79bc67..d7dee56d3 100644
--- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs
+++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs
@@ -36,6 +36,7 @@ public unsafe TestClass () : base (ref *InvalidJniObjectReference, JniObjectRefe
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='TestClass']/method[@name='baseMethod' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("baseMethod", "()V")]
 		public virtual unsafe void BaseMethod ()
 		{
 			const string __id = "baseMethod.()V";
diff --git a/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs
index c3c4e3c64..3bbffcffd 100644
--- a/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs
@@ -21,7 +21,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -42,7 +41,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -63,7 +61,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -84,7 +81,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -105,7 +101,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -126,7 +121,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
@@ -147,7 +141,6 @@ public partial class SomeObject : global::Java.Lang.Object {
 
 				try {
 					_members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default);
-
 				} finally {
 					GC.KeepAlive (value);
 				}
diff --git a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
index e63b2eb74..8a582c4fa 100644
--- a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
+++ b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs
@@ -20,6 +20,7 @@ protected CSharpKeywords (ref JniObjectReference reference, JniObjectReferenceOp
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='CSharpKeywords']/method[@name='usePartial' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("usePartial", "(I)Ljava/lang/String;")]
 		public virtual unsafe string UsePartial (int partial)
 		{
 			const string __id = "usePartial.(I)Ljava/lang/String;";
@@ -33,6 +34,7 @@ public virtual unsafe string UsePartial (int partial)
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='CSharpKeywords']/method[@name='useThis' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
+		[global::Java.Interop.JniMethodSignature ("useThis", "(Ljava/lang/String;)Ljava/lang/String;")]
 		public static unsafe string UseThis (string this_)
 		{
 			const string __id = "useThis.(Ljava/lang/String;)Ljava/lang/String;";
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
index 84b945702..0d0b92994 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs
@@ -8,6 +8,7 @@ namespace Xamarin.Test {
 	[global::Java.Interop.JniTypeSignature ("xamarin/test/I1", GenerateJavaPeer=false)]
 	public partial interface II1 : IJavaPeerable {
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='I1']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		void Close ();
 
 	}
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
index fd75eef64..9a91d592f 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs
@@ -8,6 +8,7 @@ namespace Xamarin.Test {
 	[global::Java.Interop.JniTypeSignature ("xamarin/test/I2", GenerateJavaPeer=false)]
 	public partial interface II2 : IJavaPeerable {
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='I2']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		void Close ();
 
 	}
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
index 2afa6d339..433f0a4b4 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs
@@ -20,6 +20,7 @@ protected SomeObject (ref JniObjectReference reference, JniObjectReferenceOption
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		public virtual unsafe void Close ()
 		{
 			const string __id = "close.()V";
diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
index d10e9ec08..1e22265d6 100644
--- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
+++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs
@@ -20,6 +20,7 @@ protected SomeObject2 (ref JniObjectReference reference, JniObjectReferenceOptio
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject2']/method[@name='irrelevant' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("irrelevant", "()V")]
 		public virtual unsafe void Irrelevant ()
 		{
 			const string __id = "irrelevant.()V";
@@ -49,6 +50,7 @@ public SomeObject2Invoker (ref JniObjectReference reference, JniObjectReferenceO
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='I1']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		public override unsafe void Close ()
 		{
 			const string __id = "close.()V";
diff --git a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
index a02d7152a..1805d0e74 100644
--- a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
@@ -21,25 +21,31 @@ protected SomeObject (ref JniObjectReference reference, JniObjectReferenceOption
 
 		public abstract int SomeInteger {
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeInteger' and count(parameter)=0]"
+			[global::Java.Interop.JniMethodSignature ("getSomeInteger", "()I")]
 			get; 
 
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeInteger' and count(parameter)=1 and parameter[1][@type='int']]"
+			[global::Java.Interop.JniMethodSignature ("setSomeInteger", "(I)V")]
 			set; 
 		}
 
 		public abstract global::Java.Lang.Object SomeObjectProperty {
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeObjectProperty' and count(parameter)=0]"
+			[global::Java.Interop.JniMethodSignature ("getSomeObjectProperty", "()Ljava/lang/Object;")]
 			get; 
 
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObjectProperty' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
+			[global::Java.Interop.JniMethodSignature ("setSomeObjectProperty", "(Ljava/lang/Object;)V")]
 			set; 
 		}
 
 		public abstract string SomeString {
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeString' and count(parameter)=0]"
+			[global::Java.Interop.JniMethodSignature ("getSomeString", "()Ljava/lang/String;")]
 			get; 
 
 			// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeString' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"
+			[global::Java.Interop.JniMethodSignature ("setSomeString", "(Ljava/lang/String;)V")]
 			set; 
 		}
 
diff --git a/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs
index fd171f579..1dc9d368e 100644
--- a/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs
@@ -20,6 +20,7 @@ protected SomeObject (ref JniObjectReference reference, JniObjectReferenceOption
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='methodAsInt' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("methodAsInt", "()I")]
 		public static unsafe int MethodAsInt ()
 		{
 			const string __id = "methodAsInt.()I";
@@ -31,6 +32,7 @@ public static unsafe int MethodAsInt ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='methodAsString' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("methodAsString", "()Ljava/lang/String;")]
 		public static unsafe string MethodAsString ()
 		{
 			const string __id = "methodAsString.()Ljava/lang/String;";
@@ -43,6 +45,7 @@ public static unsafe string MethodAsString ()
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='Obsoletemethod' and count(parameter)=0]"
 		[Obsolete (@"Deprecated please use methodAsString")]
+		[global::Java.Interop.JniMethodSignature ("Obsoletemethod", "()Ljava/lang/String;")]
 		public static unsafe string Obsoletemethod ()
 		{
 			const string __id = "Obsoletemethod.()Ljava/lang/String;";
diff --git a/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs
index aca478733..1ec40e23b 100644
--- a/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs
+++ b/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs
@@ -66,6 +66,7 @@ public static unsafe string SomeString {
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeObject' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("getSomeObject", "()Ljava/lang/Object;")]
 		public static unsafe global::Java.Lang.Object GetSomeObject ()
 		{
 			const string __id = "getSomeObject.()Ljava/lang/Object;";
@@ -77,6 +78,7 @@ public static unsafe string SomeString {
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObject' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]"
+		[global::Java.Interop.JniMethodSignature ("setSomeObject", "(Ljava/lang/Object;)V")]
 		public static unsafe void SetSomeObject (global::Java.Lang.Object newvalue)
 		{
 			const string __id = "setSomeObject.(Ljava/lang/Object;)V";
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
index 91e4ebd60..4e1f4018e 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
@@ -39,6 +39,7 @@ public unsafe FilterOutputStream (global::Java.IO.OutputStream @out) : base (ref
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='FilterOutputStream']/method[@name='write' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("write", "(I)V")]
 		public override unsafe void Write (int oneByte)
 		{
 			const string __id = "write.(I)V";
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
index a1ca90283..9cf0dfacf 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs
@@ -20,6 +20,7 @@ protected IOException (ref JniObjectReference reference, JniObjectReferenceOptio
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='IOException']/method[@name='printStackTrace' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("printStackTrace", "()V")]
 		public virtual unsafe void PrintStackTrace ()
 		{
 			const string __id = "printStackTrace.()V";
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
index 7fca6aac1..99fe8d937 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
@@ -36,6 +36,7 @@ public unsafe InputStream () : base (ref *InvalidJniObjectReference, JniObjectRe
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='available' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("available", "()I")]
 		public virtual unsafe int Available ()
 		{
 			const string __id = "available.()I";
@@ -47,6 +48,7 @@ public virtual unsafe int Available ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		public virtual unsafe void Close ()
 		{
 			const string __id = "close.()V";
@@ -57,6 +59,7 @@ public virtual unsafe void Close ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='mark' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("mark", "(I)V")]
 		public virtual unsafe void Mark (int readlimit)
 		{
 			const string __id = "mark.(I)V";
@@ -69,6 +72,7 @@ public virtual unsafe void Mark (int readlimit)
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='markSupported' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("markSupported", "()Z")]
 		public virtual unsafe bool MarkSupported ()
 		{
 			const string __id = "markSupported.()Z";
@@ -83,6 +87,7 @@ public virtual unsafe bool MarkSupported ()
 		public abstract int Read ();
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='read' and count(parameter)=1 and parameter[1][@type='byte[]']]"
+		[global::Java.Interop.JniMethodSignature ("read", "([B)I")]
 		public virtual unsafe int Read (global::Java.Interop.JavaSByteArray buffer)
 		{
 			const string __id = "read.([B)I";
@@ -101,6 +106,7 @@ public virtual unsafe int Read (global::Java.Interop.JavaSByteArray buffer)
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='read' and count(parameter)=3 and parameter[1][@type='byte[]'] and parameter[2][@type='int'] and parameter[3][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("read", "([BII)I")]
 		public virtual unsafe int Read (global::Java.Interop.JavaSByteArray buffer, int byteOffset, int byteCount)
 		{
 			const string __id = "read.([BII)I";
@@ -121,6 +127,7 @@ public virtual unsafe int Read (global::Java.Interop.JavaSByteArray buffer, int
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='reset' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("reset", "()V")]
 		public virtual unsafe void Reset ()
 		{
 			const string __id = "reset.()V";
@@ -131,6 +138,7 @@ public virtual unsafe void Reset ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='skip' and count(parameter)=1 and parameter[1][@type='long']]"
+		[global::Java.Interop.JniMethodSignature ("skip", "(J)J")]
 		public virtual unsafe long Skip (long byteCount)
 		{
 			const string __id = "skip.(J)J";
@@ -160,6 +168,7 @@ public InputStreamInvoker (ref JniObjectReference reference, JniObjectReferenceO
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='read' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("read", "()I")]
 		public override unsafe int Read ()
 		{
 			const string __id = "read.()I";
diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
index e5b645b4a..d046ebe6c 100644
--- a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
+++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
@@ -36,6 +36,7 @@ public unsafe OutputStream () : base (ref *InvalidJniObjectReference, JniObjectR
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='close' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("close", "()V")]
 		public virtual unsafe void Close ()
 		{
 			const string __id = "close.()V";
@@ -46,6 +47,7 @@ public virtual unsafe void Close ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='flush' and count(parameter)=0]"
+		[global::Java.Interop.JniMethodSignature ("flush", "()V")]
 		public virtual unsafe void Flush ()
 		{
 			const string __id = "flush.()V";
@@ -56,6 +58,7 @@ public virtual unsafe void Flush ()
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='write' and count(parameter)=1 and parameter[1][@type='byte[]']]"
+		[global::Java.Interop.JniMethodSignature ("write", "([B)V")]
 		public virtual unsafe void Write (global::Java.Interop.JavaSByteArray buffer)
 		{
 			const string __id = "write.([B)V";
@@ -73,6 +76,7 @@ public virtual unsafe void Write (global::Java.Interop.JavaSByteArray buffer)
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='write' and count(parameter)=3 and parameter[1][@type='byte[]'] and parameter[2][@type='int'] and parameter[3][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("write", "([BII)V")]
 		public virtual unsafe void Write (global::Java.Interop.JavaSByteArray buffer, int offset, int count)
 		{
 			const string __id = "write.([BII)V";
@@ -111,6 +115,7 @@ public OutputStreamInvoker (ref JniObjectReference reference, JniObjectReference
 		}
 
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='write' and count(parameter)=1 and parameter[1][@type='int']]"
+		[global::Java.Interop.JniMethodSignature ("write", "(I)V")]
 		public override unsafe void Write (int oneByte)
 		{
 			const string __id = "write.(I)V";
diff --git a/tools/generator/CodeGenerator.cs b/tools/generator/CodeGenerator.cs
index c7271d261..880d91daf 100644
--- a/tools/generator/CodeGenerator.cs
+++ b/tools/generator/CodeGenerator.cs
@@ -268,7 +268,7 @@ static bool BindSameType (TypeDefinition a, TypeDefinition b, TypeDefinitionCach
 				return false;
 			if (!a.ImplementsInterface ("Android.Runtime.IJavaObject", cache) || !b.ImplementsInterface ("Android.Runtime.IJavaObject", cache))
 				return false;
-			return JavaNativeTypeManager.ToJniName (a) == JavaNativeTypeManager.ToJniName (b);
+			return JavaNativeTypeManager.ToJniName (a, cache) == JavaNativeTypeManager.ToJniName (b, cache);
 		}
 
 		static IEnumerable<GenBase> FlattenNestedTypes (IEnumerable<GenBase> gens)
diff --git a/tools/generator/SourceWriters/Attributes/JniTypeSignatureAttr.cs b/tools/generator/SourceWriters/Attributes/JniTypeSignatureAttr.cs
deleted file mode 100644
index 8028399c0..000000000
--- a/tools/generator/SourceWriters/Attributes/JniTypeSignatureAttr.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.SourceWriter;
-
-namespace generator.SourceWriters
-{
-	public class JniTypeSignatureAttr : AttributeWriter
-	{
-		public string SimpleReference { get; set; }
-		public bool GenerateJavaPeer { get; set; }
-
-		public JniTypeSignatureAttr (string simpleReference, bool generateJavaPeer)
-		{
-			SimpleReference     = simpleReference;
-			GenerateJavaPeer    = generateJavaPeer;
-		}
-
-		public override void WriteAttribute (CodeWriter writer)
-		{
-			var sb = new StringBuilder ()
-				.Append ("[global::Java.Interop.JniTypeSignature (\"")
-				.Append (SimpleReference)
-				.Append ("\", ")
-				.Append ("GenerateJavaPeer=")
-				.Append (GenerateJavaPeer ? "true" : "false")
-				.Append (")]");
-			writer.WriteLine (sb.ToString ());
-		}
-	}
-}
diff --git a/tools/generator/SourceWriters/Attributes/RegisterAttr.cs b/tools/generator/SourceWriters/Attributes/RegisterAttr.cs
index ad7abd52a..1dce7f050 100644
--- a/tools/generator/SourceWriters/Attributes/RegisterAttr.cs
+++ b/tools/generator/SourceWriters/Attributes/RegisterAttr.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Xamarin.SourceWriter;
@@ -18,6 +19,8 @@ public class RegisterAttr : AttributeWriter
 		public bool UseShortForm { get; set; }  // TODO: Temporary for matching existing unit tests
 		public bool AcwLast { get; set; }       // TODO: Temporary for matching existing unit tests
 
+		public MemberTypes? MemberType { get; set; }
+
 		public RegisterAttr (string name, string signature = null, string connector = null, bool noAcw = false, string additionalProperties = null)
 		{
 			Name = name;
@@ -29,6 +32,10 @@ public RegisterAttr (string name, string signature = null, string connector = nu
 
 		public override void WriteAttribute (CodeWriter writer)
 		{
+			if (MemberType.HasValue) {
+				WriteJavaInterop1Attribute (writer);
+				return;
+			}
 			var sb = new StringBuilder ();
 
 			if (UseGlobal)
@@ -52,5 +59,19 @@ public override void WriteAttribute (CodeWriter writer)
 
 			writer.WriteLine (sb.ToString ());
 		}
+
+		private void WriteJavaInterop1Attribute (CodeWriter writer)
+		{
+			switch (MemberType) {
+				case MemberTypes.TypeInfo:
+					writer.WriteLine ($"[global::Java.Interop.JniTypeSignature (\"{Name}\", GenerateJavaPeer={(DoNotGenerateAcw ? "false" : "true")})]");
+					break;
+				case MemberTypes.Method:
+					writer.WriteLine ($"[global::Java.Interop.JniMethodSignature (\"{Name}\", \"{Signature}\")]");
+					break;
+				default:
+					throw new NotImplementedException ($"Don't know how to write attribute for `{MemberType}`");
+			}
+		}
 	}
 }
diff --git a/tools/generator/SourceWriters/BoundAbstractProperty.cs b/tools/generator/SourceWriters/BoundAbstractProperty.cs
index cac7e0e64..fcade1968 100644
--- a/tools/generator/SourceWriters/BoundAbstractProperty.cs
+++ b/tools/generator/SourceWriters/BoundAbstractProperty.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -46,9 +47,9 @@ public BoundAbstractProperty (GenBase gen, Property property, CodeGenerationOpti
 
 			SourceWriterExtensions.AddSupportedOSPlatform (GetterAttributes, property.Getter, opt);
 
-			if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-				GetterAttributes.Add (new RegisterAttr (property.Getter.JavaName, property.Getter.JniSignature, property.Getter.GetConnectorNameFull (opt), additionalProperties: property.Getter.AdditionalAttributeString ()));
-			}
+			GetterAttributes.Add (new RegisterAttr (property.Getter.JavaName, property.Getter.JniSignature, property.Getter.GetConnectorNameFull (opt), additionalProperties: property.Getter.AdditionalAttributeString ()) {
+				MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+			});
 
 			SourceWriterExtensions.AddMethodCustomAttributes (GetterAttributes, property.Getter);
 
@@ -61,9 +62,9 @@ public BoundAbstractProperty (GenBase gen, Property property, CodeGenerationOpti
 				SourceWriterExtensions.AddSupportedOSPlatform (SetterAttributes, property.Setter, opt);
 
 				SourceWriterExtensions.AddMethodCustomAttributes (SetterAttributes, property.Setter);
-				if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-					SetterAttributes.Add (new RegisterAttr (property.Setter.JavaName, property.Setter.JniSignature, property.Setter.GetConnectorNameFull (opt), additionalProperties: property.Setter.AdditionalAttributeString ()));
-				}
+				SetterAttributes.Add (new RegisterAttr (property.Setter.JavaName, property.Setter.JniSignature, property.Setter.GetConnectorNameFull (opt), additionalProperties: property.Setter.AdditionalAttributeString ()) {
+					MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+				});
 			}
 		}
 
diff --git a/tools/generator/SourceWriters/BoundClass.cs b/tools/generator/SourceWriters/BoundClass.cs
index 647cc8977..af63a36cc 100644
--- a/tools/generator/SourceWriters/BoundClass.cs
+++ b/tools/generator/SourceWriters/BoundClass.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -48,12 +49,11 @@ public BoundClass (ClassGen klass, CodeGenerationOptions opt, CodeGeneratorConte
 
 			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, klass, opt);
 
-			if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1) {
-				Attributes.Add (new JniTypeSignatureAttr (klass.RawJniName, false));
-			}
-			else {
-				Attributes.Add (new RegisterAttr (klass.RawJniName, null, null, true, klass.AdditionalAttributeString ()) { UseGlobal = true, UseShortForm = true });
-			}
+			Attributes.Add (new RegisterAttr (klass.RawJniName, null, null, true, klass.AdditionalAttributeString ()) {
+				UseGlobal       = true,
+				UseShortForm    = true,
+				MemberType      = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.TypeInfo,
+			});
 
 			if (klass.TypeParameters != null && klass.TypeParameters.Any ())
 				Attributes.Add (new CustomAttr (klass.TypeParameters.ToGeneratedAttributeString ()));
diff --git a/tools/generator/SourceWriters/BoundInterface.cs b/tools/generator/SourceWriters/BoundInterface.cs
index 334985608..8081cc185 100644
--- a/tools/generator/SourceWriters/BoundInterface.cs
+++ b/tools/generator/SourceWriters/BoundInterface.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -50,12 +51,16 @@ public BoundInterface (InterfaceGen iface, CodeGenerationOptions opt, CodeGenera
 					? iface.FullName.Replace ('.', '/')
 					: iface.Namespace + "." + iface.FullName.Substring (iface.Namespace.Length + 1).Replace ('.', '/');
 
+				var noAcw       = false;
+				var memberType  = (MemberTypes?) null;
 				if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1) {
-					Attributes.Add (new JniTypeSignatureAttr (iface.RawJniName, false));
-				}
-				else {
-					Attributes.Add (new RegisterAttr (iface.RawJniName, string.Empty, signature + "Invoker", additionalProperties: iface.AdditionalAttributeString ()));
+					noAcw       = true;
+					memberType  = MemberTypes.TypeInfo;
 				}
+
+				Attributes.Add (new RegisterAttr (iface.RawJniName, string.Empty, signature + "Invoker", noAcw, additionalProperties: iface.AdditionalAttributeString ()) {
+					MemberType	    = memberType,
+				});
 			}
 
 			if (iface.TypeParameters != null && iface.TypeParameters.Any ())
diff --git a/tools/generator/SourceWriters/BoundInterfaceMethodDeclaration.cs b/tools/generator/SourceWriters/BoundInterfaceMethodDeclaration.cs
index 02c573913..27baf3899 100644
--- a/tools/generator/SourceWriters/BoundInterfaceMethodDeclaration.cs
+++ b/tools/generator/SourceWriters/BoundInterfaceMethodDeclaration.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -35,9 +36,9 @@ public BoundInterfaceMethodDeclaration (Method method, string adapter, CodeGener
 
 			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
 
-			if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-				Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.ConnectorName + ":" + method.GetAdapterName (opt, adapter), additionalProperties: method.AdditionalAttributeString ()));
-			}
+			Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.ConnectorName + ":" + method.GetAdapterName (opt, adapter), additionalProperties: method.AdditionalAttributeString ()) {
+				MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+			});
 
 			method.JavadocInfo?.AddJavadocs (Comments);
 
diff --git a/tools/generator/SourceWriters/BoundInterfacePropertyDeclaration.cs b/tools/generator/SourceWriters/BoundInterfacePropertyDeclaration.cs
index f34a26b26..5b93fdb65 100644
--- a/tools/generator/SourceWriters/BoundInterfacePropertyDeclaration.cs
+++ b/tools/generator/SourceWriters/BoundInterfacePropertyDeclaration.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -29,9 +30,9 @@ public BoundInterfacePropertyDeclaration (GenBase gen, Property property, string
 
 				SourceWriterExtensions.AddSupportedOSPlatform (GetterAttributes, property.Getter, opt);
 
-				if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-					GetterAttributes.Add (new RegisterAttr (property.Getter.JavaName, property.Getter.JniSignature, property.Getter.ConnectorName + ":" + property.Getter.GetAdapterName (opt, adapter), additionalProperties: property.Getter.AdditionalAttributeString ()));
-				}
+				GetterAttributes.Add (new RegisterAttr (property.Getter.JavaName, property.Getter.JniSignature, property.Getter.ConnectorName + ":" + property.Getter.GetAdapterName (opt, adapter), additionalProperties: property.Getter.AdditionalAttributeString ()) {
+					MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+				});
 			}
 
 			if (property.Setter != null) {
@@ -44,9 +45,9 @@ public BoundInterfacePropertyDeclaration (GenBase gen, Property property, string
 
 				SourceWriterExtensions.AddSupportedOSPlatform (SetterAttributes, property.Setter, opt);
 
-				if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-					SetterAttributes.Add (new RegisterAttr (property.Setter.JavaName, property.Setter.JniSignature, property.Setter.ConnectorName + ":" + property.Setter.GetAdapterName (opt, adapter), additionalProperties: property.Setter.AdditionalAttributeString ()));
-				}
+				SetterAttributes.Add (new RegisterAttr (property.Setter.JavaName, property.Setter.JniSignature, property.Setter.ConnectorName + ":" + property.Setter.GetAdapterName (opt, adapter), additionalProperties: property.Setter.AdditionalAttributeString ()) {
+					MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+				});
 			}
 		}
 	}
diff --git a/tools/generator/SourceWriters/BoundMethod.cs b/tools/generator/SourceWriters/BoundMethod.cs
index 0ab5618cf..ef81ed142 100644
--- a/tools/generator/SourceWriters/BoundMethod.cs
+++ b/tools/generator/SourceWriters/BoundMethod.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using MonoDroid.Generation;
@@ -74,9 +75,9 @@ public BoundMethod (GenBase type, Method method, CodeGenerationOptions opt, bool
 
 			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt);
 
-			if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) {
-				Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.IsVirtual ? method.GetConnectorNameFull (opt) : string.Empty, additionalProperties: method.AdditionalAttributeString ()));
-			}
+			Attributes.Add (new RegisterAttr (method.JavaName, method.JniSignature, method.IsVirtual ? method.GetConnectorNameFull (opt) : string.Empty, additionalProperties: method.AdditionalAttributeString ()) {
+				MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.Method,
+			});
 
 			SourceWriterExtensions.AddMethodCustomAttributes (Attributes, method);
 			this.AddMethodParameters (method.Parameters, opt);
diff --git a/tools/generator/SourceWriters/ClassInvokerClass.cs b/tools/generator/SourceWriters/ClassInvokerClass.cs
index 1324f4c6d..84fc75964 100644
--- a/tools/generator/SourceWriters/ClassInvokerClass.cs
+++ b/tools/generator/SourceWriters/ClassInvokerClass.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Schema;
@@ -26,11 +27,10 @@ public ClassInvokerClass (ClassGen klass, CodeGenerationOptions opt)
 			foreach (var igen in klass.GetAllDerivedInterfaces ().Where (i => i.IsGeneric))
 				Implements.Add (opt.GetOutputName (igen.FullName));
 
-			if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1) {
-				Attributes.Add (new JniTypeSignatureAttr (klass.RawJniName, false));
-			} else {
-				Attributes.Add (new RegisterAttr (klass.RawJniName, noAcw: true, additionalProperties: klass.AdditionalAttributeString ()) { UseGlobal = true });
-			}
+			Attributes.Add (new RegisterAttr (klass.RawJniName, noAcw: true, additionalProperties: klass.AdditionalAttributeString ()) {
+				UseGlobal       = true,
+				MemberType	    = opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 ? null : (MemberTypes?) MemberTypes.TypeInfo,
+			});
 
 			SourceWriterExtensions.AddSupportedOSPlatform (Attributes, klass, opt);
 
diff --git a/tools/generator/SourceWriters/InterfaceInvokerClass.cs b/tools/generator/SourceWriters/InterfaceInvokerClass.cs
index e5e1997a6..3bde0695a 100644
--- a/tools/generator/SourceWriters/InterfaceInvokerClass.cs
+++ b/tools/generator/SourceWriters/InterfaceInvokerClass.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Schema;
@@ -26,12 +27,10 @@ public InterfaceInvokerClass (InterfaceGen iface, CodeGenerationOptions opt, Cod
 
 			bool ji = opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1;
 
-			if (ji) {
-				Attributes.Add (new JniTypeSignatureAttr (iface.RawJniName, false));
-			}
-			else {
-				Attributes.Add (new RegisterAttr (iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()) { UseGlobal = true });
-			}
+			Attributes.Add (new RegisterAttr (iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()) {
+				UseGlobal       = true,
+				MemberType	    = (!ji) ? null : (MemberTypes?) MemberTypes.TypeInfo,
+			});
 
 			Fields.Add (new PeerMembersField (opt, iface.RawJniName, $"{iface.Name}Invoker", false));
 
diff --git a/tools/jcw-gen/App.cs b/tools/jcw-gen/App.cs
index b8d21bfe1..02788d55d 100644
--- a/tools/jcw-gen/App.cs
+++ b/tools/jcw-gen/App.cs
@@ -21,6 +21,7 @@ public static int Main (string [] args)
 			bool    help        = false;
 			string  outputPath  = null;
 			int     verbosity   = 0;
+			var     style       = JavaPeerStyle.XAJavaInterop1;
 
 			var options = new OptionSet {
 				"Usage: jcw-gen.exe OPTIONS* ASSEMBLY+ [@RESPONSE-FILES]",
@@ -36,6 +37,9 @@ public static int Main (string [] args)
 				{ "o=",
 				  "{DIRECTORY} to write Java source code to.",
 				  v => outputPath = v },
+				{ "codegen-target=",
+				  "STYLE of Java Callable Wrappers to generate",
+				  (JavaPeerStyle? v) => style = v.HasValue ? v.Value : style },
 				{ "v:",
 				  "Logging verbosity.",
 				  (int? v) => verbosity = v.HasValue ? v.Value : verbosity + 1 },
@@ -68,7 +72,7 @@ public static int Main (string [] args)
 				var types = scanner.GetJavaTypes (assemblies, resolver)
 					.Where (td => !JavaTypeScanner.ShouldSkipJavaCallableWrapperGeneration (td, cache));
 				foreach (var type in types) {
-					GenerateJavaCallableWrapper (type, outputPath, cache);
+					GenerateJavaCallableWrapper (type, outputPath, cache, style);
 				}
 				return 0;
 			}
@@ -81,13 +85,14 @@ public static int Main (string [] args)
 			}
 		}
 
-		static void GenerateJavaCallableWrapper (TypeDefinition type, string outputPath, TypeDefinitionCache cache)
+		static void GenerateJavaCallableWrapper (TypeDefinition type, string outputPath, TypeDefinitionCache cache, JavaPeerStyle style)
 		{
 			if (type.IsInterface) {
 				return;
 			}
 
 			var generator = new JavaCallableWrapperGenerator (type, log: Console.WriteLine, cache) {
+				CodeGenerationTarget    = style,
 			};
 			generator.Generate (outputPath);
 		}