diff --git a/.gitignore b/.gitignore
index 19a82c3b6..169bf6db1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 bin
 obj
+LocalJDK
 TestResult.xml
diff --git a/Makefile b/Makefile
index 2c7d30df9..154286d68 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,30 @@ clean:
 	$(XBUILD) /t:Clean
 	rm -Rf bin/$(CONFIGURATION)
 
-bin/$(CONFIGURATION)/libNativeTiming.dylib: tests/NativeTiming/timing.c
+JDK     = JavaDeveloper.pkg
+JDK_URL = http://adcdownload.apple.com/Developer_Tools/java_for_os_x_2013005_developer_package/java_for_os_x_2013005_dp__11m4609.dmg
+
+LOCAL_JDK_HEADERS = LocalJDK/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
+
+osx-setup: $(LOCAL_JDK_HEADERS)/jni.h
+
+$(LOCAL_JDK_HEADERS)/jni.h:
+	@if [ ! -f $(JDK) ]; then \
+		echo "Please download '$(JDK)', from: $(JDK_URL)" ; \
+		exit 1; \
+	fi
+	-mkdir LocalJDK
+	_jdk="$$(cd `dirname "$(JDK)"`; pwd)/`basename "$(JDK)"`" ; \
+	(cd LocalJDK; xar -xf $$_jdk)
+	(cd LocalJDK; gunzip -c JavaEssentialsDev.pkg/Payload | cpio -i)
+
+bin/$(CONFIGURATION)/libNativeTiming.dylib: tests/NativeTiming/timing.c $(LOCAL_JDK_HEADERS)/jni.h
+	mkdir -p `dirname "$@"`
+	gcc -g -shared -o $@ $< -m32 -I $(LOCAL_JDK_HEADERS)
+
+bin/$(CONFIGURATION)/libJavaInterop.dylib: JniEnvironment.g.c $(LOCAL_JDK_HEADERS)/jni.h
 	mkdir -p `dirname "$@"`
-	gcc -g -shared -o $@ $< -m32 -I /System/Library/Frameworks/JavaVM.framework/Headers
+	gcc -g -shared -o $@ $< -m32 -I $(LOCAL_JDK_HEADERS)
 
 bin/$(CONFIGURATION)/Java.Interop-Tests.dll: $(wildcard src/Java.Interop/*/*.cs src/Java.Interop/Tests/*/*.cs)
 	$(XBUILD)
diff --git a/README.md b/README.md
index 4e504df41..ffb50ef48 100644
--- a/README.md
+++ b/README.md
@@ -43,25 +43,17 @@ At the time of this writing, this links to
 
 [osx-jdk6]: http://adcdownload.apple.com/Developer_Tools/java_for_os_x_2013005_developer_package/java_for_os_x_2013005_dp__11m4609.dmg
 
-*Furthermore*, if running on Yosemite you must *also* download the latest
-[Java for OS X package](http://support.apple.com/downloads/#java), currently
-[JavaForOSX2014-001.dmg](http://support.apple.com/downloads/DL1572/en_US/JavaForOSX2014-001.dmg).
+Unfortunately, you can't *install* it on El Capitan. It'll install...but it
+won't *do* anything, probably because of [System Integrity Protection][sip].
 
-Once download, you need to "remove" any previously installed Java packages, as
-the Developer package won't install over a newer runtime packages:
+[sip]: https://en.wikipedia.org/wiki/System_Integrity_Protection
 
-    sudo mv /System/Library/Frameworks/JavaVM.framework /System/Library/Frameworks/JavaVM.framework-Yosemite
+To develop on El Capitan, download the above
+`java_for_os_x_2013005_dp__11m4609.dmg` file, open it within Finder,
+copy the contained `JavaDeveloper.pkg` file into this directory,
+then run the `osx-setup` target:
 
-Then install the Developer Package `java_for_os_x_2013005_dp__11m4609.dmg`,
-then install the runtime package `JavaForOSX2014-001.dmg`.
-
-If you fail to re-install the runtime package, then `jar` will fail to run:
-
-    $ jar cf "../../bin/Debug/java-interop.jar" -C "../../bin/Debug/ji-classes" .
-    java.lang.AssertionError: Platform not recognized
-            at sun.nio.fs.DefaultFileSystemProvider.create(DefaultFileSystemProvider.java:73)
-            at java.nio.file.FileSystems$DefaultFileSystemHolder.getDefaultProvider(FileSystems.java:108)
-    ...
+    $ make osx-setup JDK=JavaDeveloper.pkg
 
 
 ## Type Safety
diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.cs b/src/Java.Interop/Java.Interop/JniEnvironment.cs
index c78611212..69b9ce787 100644
--- a/src/Java.Interop/Java.Interop/JniEnvironment.cs
+++ b/src/Java.Interop/Java.Interop/JniEnvironment.cs
@@ -260,6 +260,17 @@ public Exception GetExceptionForLastThrowable ()
 			JniEnvironment.Current.LogCreateLocalRef (e);
 			return JavaVM.GetExceptionForThrowable (ref e, JniObjectReferenceOptions.DisposeSourceReference);
 		}
+
+		public Exception GetExceptionForLastThrowable (IntPtr thrown)
+		{
+			if (thrown == IntPtr.Zero)
+				return null;
+			var e   = new JniObjectReference (thrown, JniObjectReferenceType.Local);
+			// JniEnvironment.Errors.ExceptionDescribe ();
+			JniEnvironment.Exceptions.ExceptionClear ();
+			JniEnvironment.Current.LogCreateLocalRef (e);
+			return JavaVM.GetExceptionForThrowable (ref e, JniObjectReferenceOptions.DisposeSourceReference);
+		}
 	}
 }
 
diff --git a/tests/invocation-overhead/Makefile b/tests/invocation-overhead/Makefile
index 5c9d604b9..10fdfb533 100644
--- a/tests/invocation-overhead/Makefile
+++ b/tests/invocation-overhead/Makefile
@@ -1,10 +1,26 @@
-all: test-overheads.exe test-overheads-xa.exe
+JNIENV_GEN        = ../../bin/Debug/jnienv-gen.exe
+LOCAL_JDK_HEADERS = ../../LocalJDK/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
+
+all: test-overheads.exe libJavaInterop.dylib
+
+clean:
+	-rm test-overheads.exe test-overheads.exe.mdb
+	-rm -Rf libJavaInterop.dylib*
+
+HANDLE_FEATURES = \
+	-d:FEATURE_HANDLES_ARE_SAFE_HANDLES \
+	-d:FEATURE_HANDLES_ARE_INTPTRS \
+	-d:FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX \
+	-d:FEATURE_HANDLES_ARE_XA_INTPTRS
 
 test-overheads.exe: test-overheads.cs jni.cs
-	mcs -out:$@ -unsafe -d:FEATURE_HANDLES_ARE_SAFE_HANDLES -d:FEATURE_HANDLES_ARE_INTPTRS $^
+	mcs -out:$@ -unsafe $(HANDLE_FEATURES) $^
+
+jni.c jni.cs: $(JNIENV_GEN)
+	mono $< jni.cs jni.c
 
-test-overheads-xa.exe: test-overheads.cs jni-xa.cs
-	mcs -out:$@ -unsafe -d:XA -d:FEATURE_HANDLES_ARE_SAFE_HANDLES -d:FEATURE_HANDLES_ARE_INTPTRS $^
+libJavaInterop.dylib: jni.c
+	gcc -g -shared -o $@ $< -m32 -I $(LOCAL_JDK_HEADERS)
 
 run:
 	mono --debug test-overheads.exe
\ No newline at end of file
diff --git a/tests/invocation-overhead/jni-xa.cs b/tests/invocation-overhead/jni-xa.cs
deleted file mode 100644
index dcc7ce7bb..000000000
--- a/tests/invocation-overhead/jni-xa.cs
+++ /dev/null
@@ -1,9470 +0,0 @@
-// Generated file; DO NOT EDIT!
-//
-// To make changes, edit monodroid/tools/jnienv-gen-interop and rerun
-
-#if !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS
-#define FEATURE_HANDLES_ARE_SAFE_HANDLES
-#endif  // !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS
-
-#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS
-#define _NAMESPACE_PER_HANDLE
-#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS
-
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-using Java.Interop;
-
-#if FEATURE_HANDLES_ARE_INTPTRS
-	using JNIEnvPtr          = System.IntPtr;
-	using jinstanceFieldID   = System.IntPtr;
-	using jstaticFieldID     = System.IntPtr;
-	using jinstanceMethodID  = System.IntPtr;
-	using jstaticMethodID    = System.IntPtr;
-	using jobject            = System.IntPtr;
-#endif  // FEATURE_HANDLES_ARE_INTPTRS
-
-namespace Java.Interop {
-	[StructLayout (LayoutKind.Sequential)]
-	partial struct JniNativeInterfaceStruct {
-
-#pragma warning disable 0649	// Field is assigned to, and will always have its default value `null`; ignore as it'll be set in native code.
-#pragma warning disable 0169	// Field never used; ignore since these fields make the structure have the right layout.
-		private IntPtr  reserved0;                      // void*
-		private IntPtr  reserved1;                      // void*
-		private IntPtr  reserved2;                      // void*
-		private IntPtr  reserved3;                      // void*
-		public  IntPtr  GetVersion;                     // jint        (*GetVersion)(JNIEnv*);
-		public  IntPtr  DefineClass;                    // jclass      (*DefineClass)(JNIEnv*, const char, jobject, const jbyte*, jsize);
-		public  IntPtr  FindClass;                      // jclass      (*FindClass)(JNIEnv*, const char*);
-		public  IntPtr  FromReflectedMethod;            // jmethodID   (*FromReflectedMethod)(JNIEnv*, jobject);
-		public  IntPtr  FromReflectedField;             // jfieldID    (*FromReflectedField)(JNIEnv*, jobject);
-		public  IntPtr  ToReflectedMethod;              // jobject     (*ToReflectedMethod)(JNIEnv*, jclass, jmethodID, jboolean);
-		public  IntPtr  GetSuperclass;                  // jclass      (*GetSuperclass)(JNIEnv*, jclass);
-		public  IntPtr  IsAssignableFrom;               // jboolean    (*IsAssignableFrom)(JNIEnv*, jclass, jclass);
-		public  IntPtr  ToReflectedField;               // jobject     (*ToReflectedField)(JNIEnv*, jclass, jfieldID, jboolean);
-		public  IntPtr  Throw;                          // jint        (*Throw)(JNIEnv*, jthrowable);
-		public  IntPtr  ThrowNew;                       // jint        (*ThrowNew)(JNIEnv*, jclass, const char*);
-		public  IntPtr  ExceptionOccurred;              // jthrowable  (*ExceptionOccurred)(JNIEnv*);
-		public  IntPtr  ExceptionDescribe;              // void        (*ExceptionDescribe)(JNIEnv*);
-		public  IntPtr  ExceptionClear;                 // void        (*ExceptionClear)(JNIEnv*);
-		public  IntPtr  FatalError;                     // void        (*FatalError)(JNIEnv*, const char*);
-		public  IntPtr  PushLocalFrame;                 // jint        (*PushLocalFrame)(JNIEnv*, jint);
-		public  IntPtr  PopLocalFrame;                  // jobject     (*PopLocalFrame)(JNIEnv*, jobject);
-		public  IntPtr  NewGlobalRef;                   // jobject     (*NewGlobalRef)(JNIEnv*, jobject);
-		public  IntPtr  DeleteGlobalRef;                // void        (*DeleteGlobalRef)(JNIEnv*, jobject);
-		public  IntPtr  DeleteLocalRef;                 // void        (*DeleteLocalRef)(JNIEnv*, jobject);
-		public  IntPtr  IsSameObject;                   // jboolean    (*IsSameObject)(JNIEnv*, jobject, jobject);
-		public  IntPtr  NewLocalRef;                    // jobject     (*NewLocalRef)(JNIEnv*, jobject);
-		public  IntPtr  EnsureLocalCapacity;            // jint        (*EnsureLocalCapacity)(JNIEnv*, jint);
-		public  IntPtr  AllocObject;                    // jobject     (*AllocObject)(JNIEnv*, jclass);
-		public  IntPtr  NewObject;                      // jobject     (*NewObject)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  NewObjectV;                     // jobject     (*NewObjectV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  NewObjectA;                     // jobject     (*NewObjectA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  GetObjectClass;                 // jclass      (*GetObjectClass)(JNIEnv*, jobject);
-		public  IntPtr  IsInstanceOf;                   // jboolean    (*IsInstanceOf)(JNIEnv*, jobject, jclass);
-		public  IntPtr  GetMethodID;                    // jmethodID   (*GetMethodID)(JNIEnv*, jclass, const char*, const char*);
-		public  IntPtr  CallObjectMethod;               // jobject     (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallObjectMethodV;              // jobject     (*CallObjectMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallObjectMethodA;              // jobject     (*CallObjectMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallBooleanMethod;              // jboolean    (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallBooleanMethodV;             // jboolean    (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallBooleanMethodA;             // jboolean    (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallSByteMethod;                // jbyte       (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallSByteMethodV;               // jbyte       (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallSByteMethodA;               // jbyte       (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallCharMethod;                 // jchar       (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallCharMethodV;                // jchar       (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallCharMethodA;                // jchar       (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallShortMethod;                // jshort      (*CallShortMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallShortMethodV;               // jshort      (*CallShortMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallShortMethodA;               // jshort      (*CallShortMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallIntMethod;                  // jint        (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallIntMethodV;                 // jint        (*CallIntMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallIntMethodA;                 // jint        (*CallIntMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallLongMethod;                 // jlong       (*CallLongMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallLongMethodV;                // jlong       (*CallLongMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallLongMethodA;                // jlong       (*CallLongMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallFloatMethod;                // jfloat      (*CallFloatMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallFloatMethodV;               // jfloat      (*CallFloatMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallFloatMethodA;               // jfloat      (*CallFloatMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallDoubleMethod;               // jdouble     (*CallDoubleMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallDoubleMethodV;              // jdouble     (*CallDoubleMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallDoubleMethodA;              // jdouble     (*CallDoubleMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallVoidMethod;                 // void        (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallVoidMethodV;                // void        (*CallVoidMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallVoidMethodA;                // void        (*CallVoidMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualObjectMethod;     // jobject     (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualObjectMethodV;    // jobject     (*CallNonvirtualObjectMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualObjectMethodA;    // jobject     (*CallNonvirtualObjectMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualBooleanMethod;    // jboolean    (*CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualBooleanMethodV;   // jboolean    (*CallNonvirtualBooleanMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualBooleanMethodA;   // jboolean    (*CallNonvirtualBooleanMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualSByteMethod;      // jbyte       (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualSByteMethodV;     // jbyte       (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualSByteMethodA;     // jbyte       (*CallNonvirtualSByteMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualCharMethod;       // jchar       (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualCharMethodV;      // jchar       (*CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualCharMethodA;      // jchar       (*CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualShortMethod;      // jshort      (*CallNonvirtualShortMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualShortMethodV;     // jshort      (*CallNonvirtualShortMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualShortMethodA;     // jshort      (*CallNonvirtualShortMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualIntMethod;        // jint        (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualIntMethodV;       // jint        (*CallNonvirtualIntMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualIntMethodA;       // jint        (*CallNonvirtualIntMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualLongMethod;       // jlong       (*CallNonvirtualLongMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualLongMethodV;      // jlong       (*CallNonvirtualLongMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualLongMethodA;      // jlong       (*CallNonvirtualLongMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualFloatMethod;      // jfloat      (*CallNonvirtualFloatMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualFloatMethodV;     // jfloat      (*CallNonvirtualFloatMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualFloatMethodA;     // jfloat      (*CallNonvirtualFloatMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualDoubleMethod;     // jdouble     (*CallNonvirtualDoubleMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualDoubleMethodV;    // jdouble     (*CallNonvirtualDoubleMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualDoubleMethodA;    // jdouble     (*CallNonvirtualDoubleMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualVoidMethod;       // void        (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualVoidMethodV;      // void        (*CallNonvirtualVoidMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualVoidMethodA;      // void        (*CallNonvirtualVoidMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  GetFieldID;                     // jfieldID    (*GetFieldID)(JNIEnv*, jclass, const char*, const char*);
-		public  IntPtr  GetObjectField;                 // jobject     (*GetObjectField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetBooleanField;                // jboolean    (*GetBooleanField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetByteField;                   // jbyte       (*GetByteField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetCharField;                   // jchar       (*GetCharField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetShortField;                  // jshort      (*GetShortField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetIntField;                    // jint        (*GetIntField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetLongField;                   // jlong       (*GetLongField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetFloatField;                  // jfloat      (*GetFloatField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  GetDoubleField;                 // jdouble     (*GetDoubleField)(JNIEnv*, jobject, jfieldID);
-		public  IntPtr  SetObjectField;                 // void        (*SetObjectField)(JNIEnv*, jobject, jfieldID, jobject);
-		public  IntPtr  SetBooleanField;                // void        (*SetBooleanField)(JNIEnv*, jobject, jfieldID, jboolean);
-		public  IntPtr  SetByteField;                   // void        (*SetByteField)(JNIEnv*, jobject, jfieldID, jbyte);
-		public  IntPtr  SetCharField;                   // void        (*SetCharField)(JNIEnv*, jobject, jfieldID, jchar);
-		public  IntPtr  SetShortField;                  // void        (*SetShortField)(JNIEnv*, jobject, jfieldID, jshort);
-		public  IntPtr  SetIntField;                    // void        (*SetIntField)(JNIEnv*, jobject, jfieldID, jint);
-		public  IntPtr  SetLongField;                   // void        (*SetLongField)(JNIEnv*, jobject, jfieldID, jlong);
-		public  IntPtr  SetFloatField;                  // void        (*SetFloatField)(JNIEnv*, jobject, jfieldID, jfloat);
-		public  IntPtr  SetDoubleField;                 // void        (*SetDoubleField)(JNIEnv*, jobject, jfieldID, jdouble);
-		public  IntPtr  GetStaticMethodID;              // jmethodID   (*GetStaticMethodID)(JNIEnv*, jclass, const char*, const char*);
-		public  IntPtr  CallStaticObjectMethod;         // jobject     (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticObjectMethodV;        // jobject     (*CallStaticObjectMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticObjectMethodA;        // jobject     (*CallStaticObjectMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticBooleanMethod;        // jboolean    (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticBooleanMethodV;       // jboolean    (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticBooleanMethodA;       // jboolean    (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticSByteMethod;          // jbyte       (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticSByteMethodV;         // jbyte       (*CallStaticSByteMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticSByteMethodA;         // jbyte       (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticCharMethod;           // jchar       (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticCharMethodV;          // jchar       (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticCharMethodA;          // jchar       (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticShortMethod;          // jshort      (*CallStaticShortMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticShortMethodV;         // jshort      (*CallStaticShortMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticShortMethodA;         // jshort      (*CallStaticShortMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticIntMethod;            // jint        (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticIntMethodV;           // jint        (*CallStaticIntMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticIntMethodA;           // jint        (*CallStaticIntMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticLongMethod;           // jlong       (*CallStaticLongMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticLongMethodV;          // jlong       (*CallStaticLongMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticLongMethodA;          // jlong       (*CallStaticLongMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticFloatMethod;          // jfloat      (*CallStaticFloatMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticFloatMethodV;         // jfloat      (*CallStaticFloatMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticFloatMethodA;         // jfloat      (*CallStaticFloatMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticDoubleMethod;         // jdouble     (*CallStaticDoubleMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticDoubleMethodV;        // jdouble     (*CallStaticDoubleMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticDoubleMethodA;        // jdouble     (*CallStaticDoubleMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticVoidMethod;           // void        (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticVoidMethodV;          // void        (*CallStaticVoidMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticVoidMethodA;          // void        (*CallStaticVoidMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  GetStaticFieldID;               // jstaticfieldID    (*GetStaticFieldID)(JNIEnv*, jclass, const char*, const char*);
-		public  IntPtr  GetStaticObjectField;           // jobject     (*GetStaticObjectField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticBooleanField;          // jboolean    (*GetStaticBooleanField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticByteField;             // jbyte       (*GetStaticByteField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticCharField;             // jchar       (*GetStaticCharField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticShortField;            // jshort      (*GetStaticShortField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticIntField;              // jint        (*GetStaticIntField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticLongField;             // jlong       (*GetStaticLongField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticFloatField;            // jfloat      (*GetStaticFloatField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  GetStaticDoubleField;           // jdouble     (*GetStaticDoubleField)(JNIEnv*, jclass, jfieldID);
-		public  IntPtr  SetStaticObjectField;           // void        (*SetStaticObjectField)(JNIEnv*, jclass, jfieldID, jobject);
-		public  IntPtr  SetStaticBooleanField;          // void        (*SetStaticBooleanField)(JNIEnv*, jclass, jfieldID, jboolean);
-		public  IntPtr  SetStaticByteField;             // void        (*SetStaticByteField)(JNIEnv*, jclass, jfieldID, jbyte);
-		public  IntPtr  SetStaticCharField;             // void        (*SetStaticCharField)(JNIEnv*, jclass, jfieldID, jchar);
-		public  IntPtr  SetStaticShortField;            // void        (*SetStaticShortField)(JNIEnv*, jclass, jfieldID, jshort);
-		public  IntPtr  SetStaticIntField;              // void        (*SetStaticIntField)(JNIEnv*, jclass, jfieldID, jint);
-		public  IntPtr  SetStaticLongField;             // void        (*SetStaticLongField)(JNIEnv*, jclass, jfieldID, jlong);
-		public  IntPtr  SetStaticFloatField;            // void        (*SetStaticFloatField)(JNIEnv*, jclass, jfieldID, jfloat);
-		public  IntPtr  SetStaticDoubleField;           // void        (*SetStaticDoubleField)(JNIEnv*, jclass, jfieldID, jdouble);
-		public  IntPtr  NewString;                      // jstring     (*NewString)(JNIEnv*, const jchar*, jsize);
-		public  IntPtr  GetStringLength;                // jsize       (*GetStringLength)(JNIEnv*, jstring);
-		public  IntPtr  GetStringChars;                 // const jchar* (*GetStringChars)(JNIEnv*, jstring, jboolean*);
-		public  IntPtr  ReleaseStringChars;             // void        (*ReleaseStringChars)(JNIEnv*, jstring, const jchar*);
-		public  IntPtr  NewStringUTF;                   // jstring     (*NewStringUTF)(JNIEnv*, const char*);
-		public  IntPtr  GetStringUTFLength;             // jsize       (*GetStringUTFLength)(JNIEnv*, jstring);
-		public  IntPtr  GetStringUTFChars;              // const char* (*GetStringUTFChars)(JNIEnv*, jstring, jboolean*);
-		public  IntPtr  ReleaseStringUTFChars;          // void        (*ReleaseStringUTFChars)(JNIEnv*, jstring, const char*);
-		public  IntPtr  GetArrayLength;                 // jsize       (*GetArrayLength)(JNIEnv*, jarray);
-		public  IntPtr  NewObjectArray;                 // jobjectArray (*NewObjectArray)(JNIEnv*, jsize, jclass, jobject);
-		public  IntPtr  GetObjectArrayElement;          // jobject     (*GetObjectArrayElement)(JNIEnv*, jobjectArray, jsize);
-		public  IntPtr  SetObjectArrayElement;          // void        (*SetObjectArrayElement)(JNIEnv*, jobjectArray, jsize, jobject);
-		public  IntPtr  NewBooleanArray;                // jbooleanArray (*NewBooleanArray)(JNIEnv*, jsize);
-		public  IntPtr  NewByteArray;                   // jbyteArray  (*NewByteArray)(JNIEnv*, jsize);
-		public  IntPtr  NewCharArray;                   // jcharArray  (*NewCharArray)(JNIEnv*, jsize);
-		public  IntPtr  NewShortArray;                  // jshortArray (*NewShortArray)(JNIEnv*, jsize);
-		public  IntPtr  NewIntArray;                    // jintArray   (*NewIntArray)(JNIEnv*, jsize);
-		public  IntPtr  NewLongArray;                   // jlongArray  (*NewLongArray)(JNIEnv*, jsize);
-		public  IntPtr  NewFloatArray;                  // jfloatArray (*NewFloatArray)(JNIEnv*, jsize);
-		public  IntPtr  NewDoubleArray;                 // jdoubleArray (*NewDoubleArray)(JNIEnv*, jsize);
-		public  IntPtr  GetBooleanArrayElements;        // jboolean*   (*GetBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*);
-		public  IntPtr  GetByteArrayElements;           // jbyte*      (*GetByteArrayElements)(JNIEnv*, jbyteArray, jboolean*);
-		public  IntPtr  GetCharArrayElements;           // jchar*      (*GetCharArrayElements)(JNIEnv*, jcharArray, jboolean*);
-		public  IntPtr  GetShortArrayElements;          // jshort*     (*GetShortArrayElements)(JNIEnv*, jshortArray, jboolean*);
-		public  IntPtr  GetIntArrayElements;            // jint*       (*GetIntArrayElements)(JNIEnv*, jintArray, jboolean*);
-		public  IntPtr  GetLongArrayElements;           // jlong*      (*GetLongArrayElements)(JNIEnv*, jlongArray, jboolean*);
-		public  IntPtr  GetFloatArrayElements;          // jfloat*     (*GetFloatArrayElements)(JNIEnv*, jfloatArray, jboolean*);
-		public  IntPtr  GetDoubleArrayElements;         // jdouble*    (*GetDoubleArrayElements)(JNIEnv*, jdoubleArray, jboolean*);
-		public  IntPtr  ReleaseBooleanArrayElements;    // void        (*ReleaseBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*, jint);
-		public  IntPtr  ReleaseByteArrayElements;       // void        (*ReleaseByteArrayElements)(JNIEnv*, jbyteArray, jbyte*, jint);
-		public  IntPtr  ReleaseCharArrayElements;       // void        (*ReleaseCharArrayElements)(JNIEnv*, jcharArray, jchar*, jint);
-		public  IntPtr  ReleaseShortArrayElements;      // void        (*ReleaseShortArrayElements)(JNIEnv*, jshortArray, jshort*, jint);
-		public  IntPtr  ReleaseIntArrayElements;        // void        (*ReleaseIntArrayElements)(JNIEnv*, jintArray, jint*, jint);
-		public  IntPtr  ReleaseLongArrayElements;       // void        (*ReleaseLongArrayElements)(JNIEnv*, jlongArray, jlong*, jint);
-		public  IntPtr  ReleaseFloatArrayElements;      // void        (*ReleaseFloatArrayElements)(JNIEnv*, jfloatArray, jfloat*, jint);
-		public  IntPtr  ReleaseDoubleArrayElements;     // void        (*ReleaseDoubleArrayElements)(JNIEnv*, jdoubleArray, jdouble*, jint);
-		public  IntPtr  GetBooleanArrayRegion;          // void        (*GetBooleanArrayRegion)(JNIEnv*, jbooleanArray, jsize, jsize, jboolean*);
-		public  IntPtr  GetByteArrayRegion;             // void        (*GetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, jbyte*);
-		public  IntPtr  GetCharArrayRegion;             // void        (*GetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, jchar*);
-		public  IntPtr  GetShortArrayRegion;            // void        (*GetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, jshort*);
-		public  IntPtr  GetIntArrayRegion;              // void        (*GetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, jint*);
-		public  IntPtr  GetLongArrayRegion;             // void        (*GetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, jlong*);
-		public  IntPtr  GetFloatArrayRegion;            // void        (*GetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, jfloat*);
-		public  IntPtr  GetDoubleArrayRegion;           // void        (*GetDoubleArrayRegion)(JNIEnv*, jdoubleArray, jsize, jsize, jdouble*);
-		public  IntPtr  SetBooleanArrayRegion;          // void        (*SetBooleanArrayRegion)(JNIEnv*, jbooleanArray, jsize, jsize, const jboolean*);
-		public  IntPtr  SetByteArrayRegion;             // void        (*SetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, const jbyte*);
-		public  IntPtr  SetCharArrayRegion;             // void        (*SetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, const jchar*);
-		public  IntPtr  SetShortArrayRegion;            // void        (*SetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, const jshort*);
-		public  IntPtr  SetIntArrayRegion;              // void        (*SetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, const jint*);
-		public  IntPtr  SetLongArrayRegion;             // void        (*SetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, const jlong*);
-		public  IntPtr  SetFloatArrayRegion;            // void        (*SetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, const jfloat*);
-		public  IntPtr  SetDoubleArrayRegion;           // void        (*SetDoubleArrayRegion)(JNIEnv*, jdoubleArray, jsize, jsize, const jdouble*);
-		public  IntPtr  RegisterNatives;                // jint        (*RegisterNatives)(JNIEnv*, jclass, const JNINativeMethod*, jint);
-		public  IntPtr  UnregisterNatives;              // jint        (*UnregisterNatives)(JNIEnv*, jclass);
-		public  IntPtr  MonitorEnter;                   // jint        (*MonitorEnter)(JNIEnv*, jobject);
-		public  IntPtr  MonitorExit;                    // jint        (*MonitorExit)(JNIEnv*, jobject);
-		public  IntPtr  GetJavaVM;                      // jint        (*GetJavaVM)(JNIEnv*, JavaVM**);
-		public  IntPtr  GetStringRegion;                // void        (*GetStringRegion)(JNIEnv*, jstring, jsize, jsize, jchar*);
-		public  IntPtr  GetStringUTFRegion;             // void        (*GetStringUTFRegion)(JNIEnv*, jstring, jsize, jsize, char*);
-		public  IntPtr  GetPrimitiveArrayCritical;      // void*       (*GetPrimitiveArrayCritical)(JNIEnv*, jarray, jboolean*);
-		public  IntPtr  ReleasePrimitiveArrayCritical;  // void        (*ReleasePrimitiveArrayCritical)(JNIEnv*, jarray, void*, jint);
-		public  IntPtr  GetStringCritical;              // const jchar* (*GetStringCritical)(JNIEnv*, jstring, jboolean*);
-		public  IntPtr  ReleaseStringCritical;          // void        (*ReleaseStringCritical)(JNIEnv*, jstring, const jchar*);
-		public  IntPtr  NewWeakGlobalRef;               // jweak       (*NewWeakGlobalRef)(JNIEnv*, jobject);
-		public  IntPtr  DeleteWeakGlobalRef;            // void        (*DeleteWeakGlobalRef)(JNIEnv*, jweak);
-		public  IntPtr  ExceptionCheck;                 // jboolean    (*ExceptionCheck)(JNIEnv*);
-		public  IntPtr  NewDirectByteBuffer;            // jobject     (*NewDirectByteBuffer)(JNIEnv*, void*, jlong);
-		public  IntPtr  GetDirectBufferAddress;         // void*       (*GetDirectBufferAddress)(JNIEnv*, jobject);
-		public  IntPtr  GetDirectBufferCapacity;        // jlong       (*GetDirectBufferCapacity)(JNIEnv*, jobject);
-		public  IntPtr  GetObjectRefType;               // jobjectRefType (*GetObjectRefType)(JNIEnv*, jobject);
-#pragma warning restore 0169
-#pragma warning restore 0649
-	}
-}
-#if FEATURE_HANDLES_ARE_SAFE_HANDLES
-namespace
-#if _NAMESPACE_PER_HANDLE
-	Java.Interop.SafeHandles
-#else
-	Java.Interop
-#endif
-{
-
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int (JniEnvironmentSafeHandle env);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference (JniEnvironmentSafeHandle env, string name, JniReferenceSafeHandle loader, IntPtr buf, int bufLen);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference (JniEnvironmentSafeHandle env, string classname);
-	unsafe delegate JniInstanceMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle method);
-	unsafe delegate JniInstanceFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle field);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle cls, JniInstanceMethodID jmethod, bool isStatic);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle clazz1, JniReferenceSafeHandle clazz2);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle cls, JniInstanceFieldID jfieldID, bool isStatic);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle obj);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle clazz, string message);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle (JniEnvironmentSafeHandle env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_string (JniEnvironmentSafeHandle env, string msg);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int_int (JniEnvironmentSafeHandle env, int capacity);
-	unsafe delegate JniGlobalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr (JniEnvironmentSafeHandle env, IntPtr jobject);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniInstanceMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle kls, string name, string signature);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniInstanceFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, JniReferenceSafeHandle val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, double val);
-	unsafe delegate JniStaticMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate JniStaticFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, JniReferenceSafeHandle val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, double val);
-	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference (JniEnvironmentSafeHandle env, IntPtr unicodeChars, int len);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr chars);
-	unsafe delegate string JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, string utf);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env, int length, JniReferenceSafeHandle elementClass, JniReferenceSafeHandle initialElement);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int index);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int index, JniReferenceSafeHandle value);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference (JniEnvironmentSafeHandle env, int length);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, IntPtr elems, int mode);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int start, int len, IntPtr buf);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniNativeMethodRegistration [] methods, int nMethods);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int (JniEnvironmentSafeHandle env, out JavaVMSafeHandle vm);
-	unsafe delegate JniWeakGlobalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_bool (JniEnvironmentSafeHandle env);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference (JniEnvironmentSafeHandle env, IntPtr address, long capacity);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle buf);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle buf);
-	unsafe delegate JniObjectReferenceType JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
-
-	partial class JniEnvironment {
-
-	internal static partial class Activator {
-
-		public static unsafe JniLocalReference AllocObject (JniReferenceSafeHandle jclass)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.SafeHandle, jclass);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewObject (JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewObject (JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-	}
-
-	public static partial class Arrays {
-
-		public static unsafe int GetArrayLength (JniReferenceSafeHandle array_ptr)
-		{
-			if (array_ptr == null)
-				throw new ArgumentNullException ("array_ptr");
-			if (array_ptr.IsInvalid)
-				throw new ArgumentException ("array_ptr");
-
-			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.SafeHandle, array_ptr);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewObjectArray (int length, JniReferenceSafeHandle elementClass, JniReferenceSafeHandle initialElement)
-		{
-			if (elementClass == null)
-				throw new ArgumentNullException ("elementClass");
-			if (elementClass.IsInvalid)
-				throw new ArgumentException ("elementClass");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.SafeHandle, length, elementClass, initialElement);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference GetObjectArrayElement (JniReferenceSafeHandle array, int index)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe void SetObjectArrayElement (JniReferenceSafeHandle array, int index, JniReferenceSafeHandle value)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index, value);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe JniLocalReference NewBooleanArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewByteArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewCharArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewShortArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewIntArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewLongArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewFloatArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference NewDoubleArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetBooleanArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetByteArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetCharArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetShortArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetIntArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetLongArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetFloatArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetDoubleArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe void ReleaseBooleanArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseByteArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseCharArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseShortArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseIntArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseLongArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseFloatArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseDoubleArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		internal static unsafe void GetBooleanArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetByteArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetCharArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetShortArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetIntArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetLongArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetFloatArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetDoubleArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void SetBooleanArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetByteArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetCharArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetShortArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetIntArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetLongArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetFloatArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetDoubleArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
-		{
-			if (array == null)
-				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
-				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-	}
-
-	public static partial class Errors {
-
-		public static unsafe int Throw (JniReferenceSafeHandle obj)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-
-			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-
-		public static unsafe int ThrowNew (JniReferenceSafeHandle clazz, string message)
-		{
-			if (clazz == null)
-				throw new ArgumentNullException ("clazz");
-			if (clazz.IsInvalid)
-				throw new ArgumentException ("clazz");
-			if (message == null)
-				throw new ArgumentNullException ("message");
-
-			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.SafeHandle, clazz, message);
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference ExceptionOccurred ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-
-		internal static unsafe void ExceptionDescribe ()
-		{
-			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.SafeHandle);
-		}
-
-		internal static unsafe void ExceptionClear ()
-		{
-			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.SafeHandle);
-		}
-
-		public static unsafe void FatalError (string msg)
-		{
-			if (msg == null)
-				throw new ArgumentNullException ("msg");
-
-			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.SafeHandle, msg);
-		}
-
-		internal static unsafe bool ExceptionCheck ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-	}
-
-	public static partial class Handles {
-
-		public static unsafe int PushLocalFrame (int capacity)
-		{
-			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference PopLocalFrame (JniReferenceSafeHandle result)
-		{
-			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.SafeHandle, result);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniGlobalReference NewGlobalRef (JniReferenceSafeHandle jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		internal static unsafe void DeleteGlobalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe void DeleteLocalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe JniLocalReference NewLocalRef (JniReferenceSafeHandle jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		public static unsafe int EnsureLocalCapacity (int capacity)
-		{
-			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
-		}
-
-		public static unsafe int GetJavaVM (out JavaVMSafeHandle vm)
-		{
-			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.SafeHandle, out vm);
-			return tmp;
-		}
-
-		internal static unsafe JniWeakGlobalReference NewWeakGlobalRef (JniReferenceSafeHandle jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		internal static unsafe void DeleteWeakGlobalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe JniObjectReferenceType GetObjectRefType (JniReferenceSafeHandle jobject)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-	}
-
-	public static partial class IO {
-
-		public static unsafe JniLocalReference NewDirectByteBuffer (IntPtr address, long capacity)
-		{
-			if (address == IntPtr.Zero)
-				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
-
-			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.SafeHandle, address, capacity);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetDirectBufferAddress (JniReferenceSafeHandle buf)
-		{
-			if (buf == null)
-				throw new ArgumentNullException ("buf");
-			if (buf.IsInvalid)
-				throw new ArgumentException ("buf");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
-		}
-
-		public static unsafe long GetDirectBufferCapacity (JniReferenceSafeHandle buf)
-		{
-			if (buf == null)
-				throw new ArgumentNullException ("buf");
-			if (buf.IsInvalid)
-				throw new ArgumentException ("buf");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
-		}
-	}
-
-	internal static partial class Members {
-
-		internal static unsafe JniLocalReference ToReflectedMethod (JniReferenceSafeHandle cls, JniInstanceMethodID jmethod, bool isStatic)
-		{
-			if (cls == null)
-				throw new ArgumentNullException ("cls");
-			if (cls.IsInvalid)
-				throw new ArgumentException ("cls");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.SafeHandle, cls, jmethod, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference ToReflectedField (JniReferenceSafeHandle cls, JniInstanceFieldID jfieldID, bool isStatic)
-		{
-			if (cls == null)
-				throw new ArgumentNullException ("cls");
-			if (cls.IsInvalid)
-				throw new ArgumentException ("cls");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.SafeHandle, cls, jfieldID, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniInstanceMethodID GetMethodID (JniReferenceSafeHandle kls, string name, string signature)
-		{
-			if (kls == null)
-				throw new ArgumentNullException ("kls");
-			if (kls.IsInvalid)
-				throw new ArgumentException ("kls");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (signature == null)
-				throw new ArgumentNullException ("signature");
-
-			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.SafeHandle, kls, name, signature);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference CallObjectMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference CallObjectMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe JniLocalReference CallNonvirtualObjectMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference CallNonvirtualObjectMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallNonvirtualVoidMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallNonvirtualVoidMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe JniInstanceFieldID GetFieldID (JniReferenceSafeHandle jclass, string name, string sig)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference GetObjectField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool GetBooleanField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe sbyte GetByteField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe char GetCharField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe short GetShortField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe int GetIntField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe long GetLongField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe float GetFloatField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe double GetDoubleField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, JniReferenceSafeHandle val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, bool val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, sbyte val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, char val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, short val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, int val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, long val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, float val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, double val)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		public static unsafe JniStaticMethodID GetStaticMethodID (JniReferenceSafeHandle jclass, string name, string sig)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference CallStaticObjectMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference CallStaticObjectMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallStaticVoidMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallStaticVoidMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe JniStaticFieldID GetStaticFieldID (JniReferenceSafeHandle jclass, string name, string sig)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe JniLocalReference GetStaticObjectField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool GetStaticBooleanField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe sbyte GetStaticByteField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe char GetStaticCharField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe short GetStaticShortField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe int GetStaticIntField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe long GetStaticLongField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe float GetStaticFloatField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe double GetStaticDoubleField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, JniReferenceSafeHandle val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, bool val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, sbyte val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, char val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, short val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, int val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, long val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, float val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, double val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-	}
-
-	internal static partial class Monitors {
-
-		public static unsafe int MonitorEnter (JniReferenceSafeHandle obj)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-
-		public static unsafe int MonitorExit (JniReferenceSafeHandle obj)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-	}
-
-	public static partial class Strings {
-
-		internal static unsafe JniLocalReference NewString (IntPtr unicodeChars, int len)
-		{
-			if (unicodeChars == IntPtr.Zero)
-				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
-
-			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.SafeHandle, unicodeChars, len);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe int GetStringLength (JniReferenceSafeHandle @string)
-		{
-			if (@string == null)
-				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
-				throw new ArgumentException ("@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.SafeHandle, @string);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr GetStringChars (JniReferenceSafeHandle @string, IntPtr isCopy)
-		{
-			if (@string == null)
-				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
-				throw new ArgumentException ("@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.SafeHandle, @string, isCopy);
-			return tmp;
-		}
-
-		internal static unsafe void ReleaseStringChars (JniReferenceSafeHandle @string, IntPtr chars)
-		{
-			if (@string == null)
-				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
-				throw new ArgumentException ("@string");
-			if (chars == IntPtr.Zero)
-				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
-
-			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.SafeHandle, @string, chars);
-		}
-	}
-
-	public static partial class Types {
-
-		internal static unsafe JniLocalReference DefineClass (string name, JniReferenceSafeHandle loader, IntPtr buf, int bufLen)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (loader == null)
-				throw new ArgumentNullException ("loader");
-			if (loader.IsInvalid)
-				throw new ArgumentException ("loader");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.SafeHandle, name, loader, buf, bufLen);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference FindClass (string classname)
-		{
-			if (classname == null)
-				throw new ArgumentNullException ("classname");
-
-			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.SafeHandle, classname);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference GetSuperclass (JniReferenceSafeHandle jclass)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.SafeHandle, jclass);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe bool IsAssignableFrom (JniReferenceSafeHandle clazz1, JniReferenceSafeHandle clazz2)
-		{
-			if (clazz1 == null)
-				throw new ArgumentNullException ("clazz1");
-			if (clazz1.IsInvalid)
-				throw new ArgumentException ("clazz1");
-			if (clazz2 == null)
-				throw new ArgumentNullException ("clazz2");
-			if (clazz2.IsInvalid)
-				throw new ArgumentException ("clazz2");
-
-			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.SafeHandle, clazz1, clazz2);
-			return tmp;
-		}
-
-		public static unsafe bool IsSameObject (JniReferenceSafeHandle ref1, JniReferenceSafeHandle ref2)
-		{
-			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.SafeHandle, ref1, ref2);
-			return tmp;
-		}
-
-		public static unsafe JniLocalReference GetObjectClass (JniReferenceSafeHandle jobject)
-		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.SafeHandle, jobject);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe bool IsInstanceOf (JniReferenceSafeHandle obj, JniReferenceSafeHandle clazz)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-			if (clazz == null)
-				throw new ArgumentNullException ("clazz");
-			if (clazz.IsInvalid)
-				throw new ArgumentException ("clazz");
-
-			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.SafeHandle, obj, clazz);
-			return tmp;
-		}
-
-		internal static unsafe int RegisterNatives (JniReferenceSafeHandle jclass, JniNativeMethodRegistration [] methods, int nMethods)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.SafeHandle, jclass, methods, nMethods);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int UnregisterNatives (JniReferenceSafeHandle jclass)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.SafeHandle, jclass);
-			return tmp;
-		}
-	}
-
-	internal static partial class Versions {
-
-		internal static unsafe int GetVersion ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-	}
-	}
-
-	partial class JniEnvironmentInvoker {
-
-		internal JniNativeInterfaceStruct env;
-
-		public unsafe JniEnvironmentInvoker (JniNativeInterfaceStruct* p)
-		{
-			env = *p;
-		}
-
-
-		JniFunc_JniEnvironmentSafeHandle_int _GetVersion;
-		public JniFunc_JniEnvironmentSafeHandle_int GetVersion {
-			get {
-				if (_GetVersion == null)
-					_GetVersion = (JniFunc_JniEnvironmentSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JniEnvironmentSafeHandle_int));
-				return _GetVersion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference _DefineClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference DefineClass {
-			get {
-				if (_DefineClass == null)
-					_DefineClass = (JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference));
-				return _DefineClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference _FindClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference FindClass {
-			get {
-				if (_FindClass == null)
-					_FindClass = (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference));
-				return _FindClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _FromReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID FromReflectedMethod {
-			get {
-				if (_FromReflectedMethod == null)
-					_FromReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
-				return _FromReflectedMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID _FromReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID FromReflectedField {
-			get {
-				if (_FromReflectedField == null)
-					_FromReflectedField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID));
-				return _FromReflectedField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference _ToReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference ToReflectedMethod {
-			get {
-				if (_ToReflectedMethod == null)
-					_ToReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference));
-				return _ToReflectedMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _GetSuperclass;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference GetSuperclass {
-			get {
-				if (_GetSuperclass == null)
-					_GetSuperclass = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _GetSuperclass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsAssignableFrom;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsAssignableFrom {
-			get {
-				if (_IsAssignableFrom == null)
-					_IsAssignableFrom = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
-				return _IsAssignableFrom;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference _ToReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference ToReflectedField {
-			get {
-				if (_ToReflectedField == null)
-					_ToReflectedField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference));
-				return _ToReflectedField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _Throw;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int Throw {
-			get {
-				if (_Throw == null)
-					_Throw = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _Throw;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int _ThrowNew;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int ThrowNew {
-			get {
-				if (_ThrowNew == null)
-					_ThrowNew = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int));
-				return _ThrowNew;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniLocalReference _ExceptionOccurred;
-		public JniFunc_JniEnvironmentSafeHandle_JniLocalReference ExceptionOccurred {
-			get {
-				if (_ExceptionOccurred == null)
-					_ExceptionOccurred = (JniFunc_JniEnvironmentSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JniEnvironmentSafeHandle_JniLocalReference));
-				return _ExceptionOccurred;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle _ExceptionDescribe;
-		public JniAction_JniEnvironmentSafeHandle ExceptionDescribe {
-			get {
-				if (_ExceptionDescribe == null)
-					_ExceptionDescribe = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JniEnvironmentSafeHandle));
-				return _ExceptionDescribe;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle _ExceptionClear;
-		public JniAction_JniEnvironmentSafeHandle ExceptionClear {
-			get {
-				if (_ExceptionClear == null)
-					_ExceptionClear = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JniEnvironmentSafeHandle));
-				return _ExceptionClear;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_string _FatalError;
-		public JniAction_JniEnvironmentSafeHandle_string FatalError {
-			get {
-				if (_FatalError == null)
-					_FatalError = (JniAction_JniEnvironmentSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JniEnvironmentSafeHandle_string));
-				return _FatalError;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_int _PushLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_int_int PushLocalFrame {
-			get {
-				if (_PushLocalFrame == null)
-					_PushLocalFrame = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
-				return _PushLocalFrame;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _PopLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference PopLocalFrame {
-			get {
-				if (_PopLocalFrame == null)
-					_PopLocalFrame = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _PopLocalFrame;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference _NewGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference NewGlobalRef {
-			get {
-				if (_NewGlobalRef == null)
-					_NewGlobalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference));
-				return _NewGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteGlobalRef {
-			get {
-				if (_DeleteGlobalRef == null)
-					_DeleteGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteLocalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteLocalRef {
-			get {
-				if (_DeleteLocalRef == null)
-					_DeleteLocalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteLocalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsSameObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsSameObject {
-			get {
-				if (_IsSameObject == null)
-					_IsSameObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
-				return _IsSameObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _NewLocalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference NewLocalRef {
-			get {
-				if (_NewLocalRef == null)
-					_NewLocalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _NewLocalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_int _EnsureLocalCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_int_int EnsureLocalCapacity {
-			get {
-				if (_EnsureLocalCapacity == null)
-					_EnsureLocalCapacity = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
-				return _EnsureLocalCapacity;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _AllocObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference AllocObject {
-			get {
-				if (_AllocObject == null)
-					_AllocObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _AllocObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _NewObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference NewObject {
-			get {
-				if (_NewObject == null)
-					_NewObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
-				return _NewObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _NewObjectA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference NewObjectA {
-			get {
-				if (_NewObjectA == null)
-					_NewObjectA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
-				return _NewObjectA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _GetObjectClass;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference GetObjectClass {
-			get {
-				if (_GetObjectClass == null)
-					_GetObjectClass = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _GetObjectClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsInstanceOf;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsInstanceOf {
-			get {
-				if (_IsInstanceOf == null)
-					_IsInstanceOf = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
-				return _IsInstanceOf;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID _GetMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID GetMethodID {
-			get {
-				if (_GetMethodID == null)
-					_GetMethodID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID));
-				return _GetMethodID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _CallObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference CallObjectMethod {
-			get {
-				if (_CallObjectMethod == null)
-					_CallObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
-				return _CallObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _CallObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference CallObjectMethodA {
-			get {
-				if (_CallObjectMethodA == null)
-					_CallObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
-				return _CallObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool _CallBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool CallBooleanMethod {
-			get {
-				if (_CallBooleanMethod == null)
-					_CallBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool));
-				return _CallBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool _CallBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool CallBooleanMethodA {
-			get {
-				if (_CallBooleanMethodA == null)
-					_CallBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool));
-				return _CallBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte _CallSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte CallSByteMethod {
-			get {
-				if (_CallSByteMethod == null)
-					_CallSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte));
-				return _CallSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte _CallSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte CallSByteMethodA {
-			get {
-				if (_CallSByteMethodA == null)
-					_CallSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte));
-				return _CallSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char _CallCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char CallCharMethod {
-			get {
-				if (_CallCharMethod == null)
-					_CallCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char));
-				return _CallCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char _CallCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char CallCharMethodA {
-			get {
-				if (_CallCharMethodA == null)
-					_CallCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char));
-				return _CallCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short _CallShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short CallShortMethod {
-			get {
-				if (_CallShortMethod == null)
-					_CallShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short));
-				return _CallShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short _CallShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short CallShortMethodA {
-			get {
-				if (_CallShortMethodA == null)
-					_CallShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short));
-				return _CallShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int _CallIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int CallIntMethod {
-			get {
-				if (_CallIntMethod == null)
-					_CallIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int));
-				return _CallIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int _CallIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int CallIntMethodA {
-			get {
-				if (_CallIntMethodA == null)
-					_CallIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int));
-				return _CallIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long _CallLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long CallLongMethod {
-			get {
-				if (_CallLongMethod == null)
-					_CallLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long));
-				return _CallLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long _CallLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long CallLongMethodA {
-			get {
-				if (_CallLongMethodA == null)
-					_CallLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long));
-				return _CallLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float _CallFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float CallFloatMethod {
-			get {
-				if (_CallFloatMethod == null)
-					_CallFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float));
-				return _CallFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float _CallFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float CallFloatMethodA {
-			get {
-				if (_CallFloatMethodA == null)
-					_CallFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float));
-				return _CallFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double _CallDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double CallDoubleMethod {
-			get {
-				if (_CallDoubleMethod == null)
-					_CallDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double));
-				return _CallDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double _CallDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double CallDoubleMethodA {
-			get {
-				if (_CallDoubleMethodA == null)
-					_CallDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double));
-				return _CallDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _CallVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID CallVoidMethod {
-			get {
-				if (_CallVoidMethod == null)
-					_CallVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
-				return _CallVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef _CallVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef CallVoidMethodA {
-			get {
-				if (_CallVoidMethodA == null)
-					_CallVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef));
-				return _CallVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _CallNonvirtualObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference CallNonvirtualObjectMethod {
-			get {
-				if (_CallNonvirtualObjectMethod == null)
-					_CallNonvirtualObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
-				return _CallNonvirtualObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _CallNonvirtualObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference CallNonvirtualObjectMethodA {
-			get {
-				if (_CallNonvirtualObjectMethodA == null)
-					_CallNonvirtualObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
-				return _CallNonvirtualObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool _CallNonvirtualBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool CallNonvirtualBooleanMethod {
-			get {
-				if (_CallNonvirtualBooleanMethod == null)
-					_CallNonvirtualBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool));
-				return _CallNonvirtualBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool _CallNonvirtualBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool CallNonvirtualBooleanMethodA {
-			get {
-				if (_CallNonvirtualBooleanMethodA == null)
-					_CallNonvirtualBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool));
-				return _CallNonvirtualBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte _CallNonvirtualSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte CallNonvirtualSByteMethod {
-			get {
-				if (_CallNonvirtualSByteMethod == null)
-					_CallNonvirtualSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte));
-				return _CallNonvirtualSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte _CallNonvirtualSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte CallNonvirtualSByteMethodA {
-			get {
-				if (_CallNonvirtualSByteMethodA == null)
-					_CallNonvirtualSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte));
-				return _CallNonvirtualSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char _CallNonvirtualCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char CallNonvirtualCharMethod {
-			get {
-				if (_CallNonvirtualCharMethod == null)
-					_CallNonvirtualCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char));
-				return _CallNonvirtualCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char _CallNonvirtualCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char CallNonvirtualCharMethodA {
-			get {
-				if (_CallNonvirtualCharMethodA == null)
-					_CallNonvirtualCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char));
-				return _CallNonvirtualCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short _CallNonvirtualShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short CallNonvirtualShortMethod {
-			get {
-				if (_CallNonvirtualShortMethod == null)
-					_CallNonvirtualShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short));
-				return _CallNonvirtualShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short _CallNonvirtualShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short CallNonvirtualShortMethodA {
-			get {
-				if (_CallNonvirtualShortMethodA == null)
-					_CallNonvirtualShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short));
-				return _CallNonvirtualShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int _CallNonvirtualIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int CallNonvirtualIntMethod {
-			get {
-				if (_CallNonvirtualIntMethod == null)
-					_CallNonvirtualIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int));
-				return _CallNonvirtualIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int _CallNonvirtualIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int CallNonvirtualIntMethodA {
-			get {
-				if (_CallNonvirtualIntMethodA == null)
-					_CallNonvirtualIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int));
-				return _CallNonvirtualIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long _CallNonvirtualLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long CallNonvirtualLongMethod {
-			get {
-				if (_CallNonvirtualLongMethod == null)
-					_CallNonvirtualLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long));
-				return _CallNonvirtualLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long _CallNonvirtualLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long CallNonvirtualLongMethodA {
-			get {
-				if (_CallNonvirtualLongMethodA == null)
-					_CallNonvirtualLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long));
-				return _CallNonvirtualLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float _CallNonvirtualFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float CallNonvirtualFloatMethod {
-			get {
-				if (_CallNonvirtualFloatMethod == null)
-					_CallNonvirtualFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float));
-				return _CallNonvirtualFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float _CallNonvirtualFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float CallNonvirtualFloatMethodA {
-			get {
-				if (_CallNonvirtualFloatMethodA == null)
-					_CallNonvirtualFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float));
-				return _CallNonvirtualFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double _CallNonvirtualDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double CallNonvirtualDoubleMethod {
-			get {
-				if (_CallNonvirtualDoubleMethod == null)
-					_CallNonvirtualDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double));
-				return _CallNonvirtualDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double _CallNonvirtualDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double CallNonvirtualDoubleMethodA {
-			get {
-				if (_CallNonvirtualDoubleMethodA == null)
-					_CallNonvirtualDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double));
-				return _CallNonvirtualDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _CallNonvirtualVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID CallNonvirtualVoidMethod {
-			get {
-				if (_CallNonvirtualVoidMethod == null)
-					_CallNonvirtualVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
-				return _CallNonvirtualVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef _CallNonvirtualVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef CallNonvirtualVoidMethodA {
-			get {
-				if (_CallNonvirtualVoidMethodA == null)
-					_CallNonvirtualVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef));
-				return _CallNonvirtualVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID _GetFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID GetFieldID {
-			get {
-				if (_GetFieldID == null)
-					_GetFieldID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID));
-				return _GetFieldID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference _GetObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference GetObjectField {
-			get {
-				if (_GetObjectField == null)
-					_GetObjectField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference));
-				return _GetObjectField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool _GetBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool GetBooleanField {
-			get {
-				if (_GetBooleanField == null)
-					_GetBooleanField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool));
-				return _GetBooleanField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte _GetByteField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte GetByteField {
-			get {
-				if (_GetByteField == null)
-					_GetByteField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte));
-				return _GetByteField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char _GetCharField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char GetCharField {
-			get {
-				if (_GetCharField == null)
-					_GetCharField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char));
-				return _GetCharField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short _GetShortField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short GetShortField {
-			get {
-				if (_GetShortField == null)
-					_GetShortField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short));
-				return _GetShortField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int _GetIntField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int GetIntField {
-			get {
-				if (_GetIntField == null)
-					_GetIntField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int));
-				return _GetIntField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long _GetLongField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long GetLongField {
-			get {
-				if (_GetLongField == null)
-					_GetLongField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long));
-				return _GetLongField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float _GetFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float GetFloatField {
-			get {
-				if (_GetFloatField == null)
-					_GetFloatField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float));
-				return _GetFloatField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double _GetDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double GetDoubleField {
-			get {
-				if (_GetDoubleField == null)
-					_GetDoubleField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double));
-				return _GetDoubleField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle _SetObjectField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle SetObjectField {
-			get {
-				if (_SetObjectField == null)
-					_SetObjectField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle));
-				return _SetObjectField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool _SetBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool SetBooleanField {
-			get {
-				if (_SetBooleanField == null)
-					_SetBooleanField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool));
-				return _SetBooleanField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte _SetByteField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte SetByteField {
-			get {
-				if (_SetByteField == null)
-					_SetByteField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte));
-				return _SetByteField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char _SetCharField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char SetCharField {
-			get {
-				if (_SetCharField == null)
-					_SetCharField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char));
-				return _SetCharField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short _SetShortField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short SetShortField {
-			get {
-				if (_SetShortField == null)
-					_SetShortField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short));
-				return _SetShortField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int _SetIntField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int SetIntField {
-			get {
-				if (_SetIntField == null)
-					_SetIntField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int));
-				return _SetIntField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long _SetLongField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long SetLongField {
-			get {
-				if (_SetLongField == null)
-					_SetLongField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long));
-				return _SetLongField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float _SetFloatField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float SetFloatField {
-			get {
-				if (_SetFloatField == null)
-					_SetFloatField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float));
-				return _SetFloatField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double _SetDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double SetDoubleField {
-			get {
-				if (_SetDoubleField == null)
-					_SetDoubleField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double));
-				return _SetDoubleField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID _GetStaticMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID GetStaticMethodID {
-			get {
-				if (_GetStaticMethodID == null)
-					_GetStaticMethodID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID));
-				return _GetStaticMethodID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference _CallStaticObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference CallStaticObjectMethod {
-			get {
-				if (_CallStaticObjectMethod == null)
-					_CallStaticObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference));
-				return _CallStaticObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference _CallStaticObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference CallStaticObjectMethodA {
-			get {
-				if (_CallStaticObjectMethodA == null)
-					_CallStaticObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference));
-				return _CallStaticObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool _CallStaticBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool CallStaticBooleanMethod {
-			get {
-				if (_CallStaticBooleanMethod == null)
-					_CallStaticBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool));
-				return _CallStaticBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool _CallStaticBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool CallStaticBooleanMethodA {
-			get {
-				if (_CallStaticBooleanMethodA == null)
-					_CallStaticBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool));
-				return _CallStaticBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte _CallStaticSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte CallStaticSByteMethod {
-			get {
-				if (_CallStaticSByteMethod == null)
-					_CallStaticSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte));
-				return _CallStaticSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte _CallStaticSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte CallStaticSByteMethodA {
-			get {
-				if (_CallStaticSByteMethodA == null)
-					_CallStaticSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte));
-				return _CallStaticSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char _CallStaticCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char CallStaticCharMethod {
-			get {
-				if (_CallStaticCharMethod == null)
-					_CallStaticCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char));
-				return _CallStaticCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char _CallStaticCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char CallStaticCharMethodA {
-			get {
-				if (_CallStaticCharMethodA == null)
-					_CallStaticCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char));
-				return _CallStaticCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short _CallStaticShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short CallStaticShortMethod {
-			get {
-				if (_CallStaticShortMethod == null)
-					_CallStaticShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short));
-				return _CallStaticShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short _CallStaticShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short CallStaticShortMethodA {
-			get {
-				if (_CallStaticShortMethodA == null)
-					_CallStaticShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short));
-				return _CallStaticShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int _CallStaticIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int CallStaticIntMethod {
-			get {
-				if (_CallStaticIntMethod == null)
-					_CallStaticIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int));
-				return _CallStaticIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int _CallStaticIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int CallStaticIntMethodA {
-			get {
-				if (_CallStaticIntMethodA == null)
-					_CallStaticIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int));
-				return _CallStaticIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long _CallStaticLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long CallStaticLongMethod {
-			get {
-				if (_CallStaticLongMethod == null)
-					_CallStaticLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long));
-				return _CallStaticLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long _CallStaticLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long CallStaticLongMethodA {
-			get {
-				if (_CallStaticLongMethodA == null)
-					_CallStaticLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long));
-				return _CallStaticLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float _CallStaticFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float CallStaticFloatMethod {
-			get {
-				if (_CallStaticFloatMethod == null)
-					_CallStaticFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float));
-				return _CallStaticFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float _CallStaticFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float CallStaticFloatMethodA {
-			get {
-				if (_CallStaticFloatMethodA == null)
-					_CallStaticFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float));
-				return _CallStaticFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double _CallStaticDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double CallStaticDoubleMethod {
-			get {
-				if (_CallStaticDoubleMethod == null)
-					_CallStaticDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double));
-				return _CallStaticDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double _CallStaticDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double CallStaticDoubleMethodA {
-			get {
-				if (_CallStaticDoubleMethodA == null)
-					_CallStaticDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double));
-				return _CallStaticDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID _CallStaticVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID CallStaticVoidMethod {
-			get {
-				if (_CallStaticVoidMethod == null)
-					_CallStaticVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID));
-				return _CallStaticVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef _CallStaticVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef CallStaticVoidMethodA {
-			get {
-				if (_CallStaticVoidMethodA == null)
-					_CallStaticVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef));
-				return _CallStaticVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID _GetStaticFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID GetStaticFieldID {
-			get {
-				if (_GetStaticFieldID == null)
-					_GetStaticFieldID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID));
-				return _GetStaticFieldID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference _GetStaticObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference GetStaticObjectField {
-			get {
-				if (_GetStaticObjectField == null)
-					_GetStaticObjectField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference));
-				return _GetStaticObjectField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool _GetStaticBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool GetStaticBooleanField {
-			get {
-				if (_GetStaticBooleanField == null)
-					_GetStaticBooleanField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool));
-				return _GetStaticBooleanField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte _GetStaticByteField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte GetStaticByteField {
-			get {
-				if (_GetStaticByteField == null)
-					_GetStaticByteField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte));
-				return _GetStaticByteField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char _GetStaticCharField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char GetStaticCharField {
-			get {
-				if (_GetStaticCharField == null)
-					_GetStaticCharField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char));
-				return _GetStaticCharField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short _GetStaticShortField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short GetStaticShortField {
-			get {
-				if (_GetStaticShortField == null)
-					_GetStaticShortField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short));
-				return _GetStaticShortField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int _GetStaticIntField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int GetStaticIntField {
-			get {
-				if (_GetStaticIntField == null)
-					_GetStaticIntField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int));
-				return _GetStaticIntField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long _GetStaticLongField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long GetStaticLongField {
-			get {
-				if (_GetStaticLongField == null)
-					_GetStaticLongField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long));
-				return _GetStaticLongField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float _GetStaticFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float GetStaticFloatField {
-			get {
-				if (_GetStaticFloatField == null)
-					_GetStaticFloatField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float));
-				return _GetStaticFloatField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double _GetStaticDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double GetStaticDoubleField {
-			get {
-				if (_GetStaticDoubleField == null)
-					_GetStaticDoubleField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double));
-				return _GetStaticDoubleField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle _SetStaticObjectField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle SetStaticObjectField {
-			get {
-				if (_SetStaticObjectField == null)
-					_SetStaticObjectField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle));
-				return _SetStaticObjectField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool _SetStaticBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool SetStaticBooleanField {
-			get {
-				if (_SetStaticBooleanField == null)
-					_SetStaticBooleanField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool));
-				return _SetStaticBooleanField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte _SetStaticByteField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte SetStaticByteField {
-			get {
-				if (_SetStaticByteField == null)
-					_SetStaticByteField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte));
-				return _SetStaticByteField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char _SetStaticCharField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char SetStaticCharField {
-			get {
-				if (_SetStaticCharField == null)
-					_SetStaticCharField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char));
-				return _SetStaticCharField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short _SetStaticShortField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short SetStaticShortField {
-			get {
-				if (_SetStaticShortField == null)
-					_SetStaticShortField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short));
-				return _SetStaticShortField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int _SetStaticIntField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int SetStaticIntField {
-			get {
-				if (_SetStaticIntField == null)
-					_SetStaticIntField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int));
-				return _SetStaticIntField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long _SetStaticLongField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long SetStaticLongField {
-			get {
-				if (_SetStaticLongField == null)
-					_SetStaticLongField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long));
-				return _SetStaticLongField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float _SetStaticFloatField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float SetStaticFloatField {
-			get {
-				if (_SetStaticFloatField == null)
-					_SetStaticFloatField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float));
-				return _SetStaticFloatField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double _SetStaticDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double SetStaticDoubleField {
-			get {
-				if (_SetStaticDoubleField == null)
-					_SetStaticDoubleField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double));
-				return _SetStaticDoubleField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference _NewString;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference NewString {
-			get {
-				if (_NewString == null)
-					_NewString = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference));
-				return _NewString;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetStringLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetStringLength {
-			get {
-				if (_GetStringLength == null)
-					_GetStringLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _GetStringLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetStringChars;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetStringChars {
-			get {
-				if (_GetStringChars == null)
-					_GetStringChars = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetStringChars;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr _ReleaseStringChars;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr ReleaseStringChars {
-			get {
-				if (_ReleaseStringChars == null)
-					_ReleaseStringChars = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr));
-				return _ReleaseStringChars;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference _NewStringUTF;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference NewStringUTF {
-			get {
-				if (_NewStringUTF == null)
-					_NewStringUTF = (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference));
-				return _NewStringUTF;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetStringUTFLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetStringUTFLength {
-			get {
-				if (_GetStringUTFLength == null)
-					_GetStringUTFLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _GetStringUTFLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string _GetStringUTFChars;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string GetStringUTFChars {
-			get {
-				if (_GetStringUTFChars == null)
-					_GetStringUTFChars = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string));
-				return _GetStringUTFChars;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string _ReleaseStringUTFChars;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string ReleaseStringUTFChars {
-			get {
-				if (_ReleaseStringUTFChars == null)
-					_ReleaseStringUTFChars = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string));
-				return _ReleaseStringUTFChars;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetArrayLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetArrayLength {
-			get {
-				if (_GetArrayLength == null)
-					_GetArrayLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _GetArrayLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference _NewObjectArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference NewObjectArray {
-			get {
-				if (_NewObjectArray == null)
-					_NewObjectArray = (JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference));
-				return _NewObjectArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference _GetObjectArrayElement;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference GetObjectArrayElement {
-			get {
-				if (_GetObjectArrayElement == null)
-					_GetObjectArrayElement = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference));
-				return _GetObjectArrayElement;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle _SetObjectArrayElement;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle SetObjectArrayElement {
-			get {
-				if (_SetObjectArrayElement == null)
-					_SetObjectArrayElement = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle));
-				return _SetObjectArrayElement;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewBooleanArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewBooleanArray {
-			get {
-				if (_NewBooleanArray == null)
-					_NewBooleanArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewBooleanArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewByteArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewByteArray {
-			get {
-				if (_NewByteArray == null)
-					_NewByteArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewByteArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewCharArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewCharArray {
-			get {
-				if (_NewCharArray == null)
-					_NewCharArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewCharArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewShortArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewShortArray {
-			get {
-				if (_NewShortArray == null)
-					_NewShortArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewShortArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewIntArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewIntArray {
-			get {
-				if (_NewIntArray == null)
-					_NewIntArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewIntArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewLongArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewLongArray {
-			get {
-				if (_NewLongArray == null)
-					_NewLongArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewLongArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewFloatArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewFloatArray {
-			get {
-				if (_NewFloatArray == null)
-					_NewFloatArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewFloatArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewDoubleArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewDoubleArray {
-			get {
-				if (_NewDoubleArray == null)
-					_NewDoubleArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
-				return _NewDoubleArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetBooleanArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetBooleanArrayElements {
-			get {
-				if (_GetBooleanArrayElements == null)
-					_GetBooleanArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetBooleanArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetByteArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetByteArrayElements {
-			get {
-				if (_GetByteArrayElements == null)
-					_GetByteArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetByteArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetCharArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetCharArrayElements {
-			get {
-				if (_GetCharArrayElements == null)
-					_GetCharArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetCharArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetShortArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetShortArrayElements {
-			get {
-				if (_GetShortArrayElements == null)
-					_GetShortArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetShortArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetIntArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetIntArrayElements {
-			get {
-				if (_GetIntArrayElements == null)
-					_GetIntArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetIntArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetLongArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetLongArrayElements {
-			get {
-				if (_GetLongArrayElements == null)
-					_GetLongArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetLongArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetFloatArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetFloatArrayElements {
-			get {
-				if (_GetFloatArrayElements == null)
-					_GetFloatArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetFloatArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetDoubleArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetDoubleArrayElements {
-			get {
-				if (_GetDoubleArrayElements == null)
-					_GetDoubleArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetDoubleArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseBooleanArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseBooleanArrayElements {
-			get {
-				if (_ReleaseBooleanArrayElements == null)
-					_ReleaseBooleanArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseBooleanArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseByteArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseByteArrayElements {
-			get {
-				if (_ReleaseByteArrayElements == null)
-					_ReleaseByteArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseByteArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseCharArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseCharArrayElements {
-			get {
-				if (_ReleaseCharArrayElements == null)
-					_ReleaseCharArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseCharArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseShortArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseShortArrayElements {
-			get {
-				if (_ReleaseShortArrayElements == null)
-					_ReleaseShortArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseShortArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseIntArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseIntArrayElements {
-			get {
-				if (_ReleaseIntArrayElements == null)
-					_ReleaseIntArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseIntArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseLongArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseLongArrayElements {
-			get {
-				if (_ReleaseLongArrayElements == null)
-					_ReleaseLongArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseLongArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseFloatArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseFloatArrayElements {
-			get {
-				if (_ReleaseFloatArrayElements == null)
-					_ReleaseFloatArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseFloatArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseDoubleArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseDoubleArrayElements {
-			get {
-				if (_ReleaseDoubleArrayElements == null)
-					_ReleaseDoubleArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleaseDoubleArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetBooleanArrayRegion {
-			get {
-				if (_GetBooleanArrayRegion == null)
-					_GetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetBooleanArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetByteArrayRegion {
-			get {
-				if (_GetByteArrayRegion == null)
-					_GetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetByteArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetCharArrayRegion {
-			get {
-				if (_GetCharArrayRegion == null)
-					_GetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetCharArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetShortArrayRegion {
-			get {
-				if (_GetShortArrayRegion == null)
-					_GetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetShortArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetIntArrayRegion {
-			get {
-				if (_GetIntArrayRegion == null)
-					_GetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetIntArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetLongArrayRegion {
-			get {
-				if (_GetLongArrayRegion == null)
-					_GetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetLongArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetFloatArrayRegion {
-			get {
-				if (_GetFloatArrayRegion == null)
-					_GetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetFloatArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetDoubleArrayRegion {
-			get {
-				if (_GetDoubleArrayRegion == null)
-					_GetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetDoubleArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetBooleanArrayRegion {
-			get {
-				if (_SetBooleanArrayRegion == null)
-					_SetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetBooleanArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetByteArrayRegion {
-			get {
-				if (_SetByteArrayRegion == null)
-					_SetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetByteArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetCharArrayRegion {
-			get {
-				if (_SetCharArrayRegion == null)
-					_SetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetCharArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetShortArrayRegion {
-			get {
-				if (_SetShortArrayRegion == null)
-					_SetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetShortArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetIntArrayRegion {
-			get {
-				if (_SetIntArrayRegion == null)
-					_SetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetIntArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetLongArrayRegion {
-			get {
-				if (_SetLongArrayRegion == null)
-					_SetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetLongArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetFloatArrayRegion {
-			get {
-				if (_SetFloatArrayRegion == null)
-					_SetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetFloatArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetDoubleArrayRegion {
-			get {
-				if (_SetDoubleArrayRegion == null)
-					_SetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _SetDoubleArrayRegion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int RegisterNatives {
-			get {
-				if (_RegisterNatives == null)
-					_RegisterNatives = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int));
-				return _RegisterNatives;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _UnregisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int UnregisterNatives {
-			get {
-				if (_UnregisterNatives == null)
-					_UnregisterNatives = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _UnregisterNatives;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _MonitorEnter;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int MonitorEnter {
-			get {
-				if (_MonitorEnter == null)
-					_MonitorEnter = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _MonitorEnter;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _MonitorExit;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int MonitorExit {
-			get {
-				if (_MonitorExit == null)
-					_MonitorExit = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
-				return _MonitorExit;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int _GetJavaVM;
-		public JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int GetJavaVM {
-			get {
-				if (_GetJavaVM == null)
-					_GetJavaVM = (JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int));
-				return _GetJavaVM;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetStringRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetStringRegion {
-			get {
-				if (_GetStringRegion == null)
-					_GetStringRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetStringRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetStringUTFRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetStringUTFRegion {
-			get {
-				if (_GetStringUTFRegion == null)
-					_GetStringUTFRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
-				return _GetStringUTFRegion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetPrimitiveArrayCritical;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetPrimitiveArrayCritical {
-			get {
-				if (_GetPrimitiveArrayCritical == null)
-					_GetPrimitiveArrayCritical = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
-				return _GetPrimitiveArrayCritical;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleasePrimitiveArrayCritical;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleasePrimitiveArrayCritical {
-			get {
-				if (_ReleasePrimitiveArrayCritical == null)
-					_ReleasePrimitiveArrayCritical = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
-				return _ReleasePrimitiveArrayCritical;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string _GetStringCritical;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string GetStringCritical {
-			get {
-				if (_GetStringCritical == null)
-					_GetStringCritical = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string));
-				return _GetStringCritical;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string _ReleaseStringCritical;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string ReleaseStringCritical {
-			get {
-				if (_ReleaseStringCritical == null)
-					_ReleaseStringCritical = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string));
-				return _ReleaseStringCritical;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference _NewWeakGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference NewWeakGlobalRef {
-			get {
-				if (_NewWeakGlobalRef == null)
-					_NewWeakGlobalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference));
-				return _NewWeakGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteWeakGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteWeakGlobalRef {
-			get {
-				if (_DeleteWeakGlobalRef == null)
-					_DeleteWeakGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteWeakGlobalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_bool _ExceptionCheck;
-		public JniFunc_JniEnvironmentSafeHandle_bool ExceptionCheck {
-			get {
-				if (_ExceptionCheck == null)
-					_ExceptionCheck = (JniFunc_JniEnvironmentSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JniEnvironmentSafeHandle_bool));
-				return _ExceptionCheck;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference _NewDirectByteBuffer;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference NewDirectByteBuffer {
-			get {
-				if (_NewDirectByteBuffer == null)
-					_NewDirectByteBuffer = (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference));
-				return _NewDirectByteBuffer;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr _GetDirectBufferAddress;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr GetDirectBufferAddress {
-			get {
-				if (_GetDirectBufferAddress == null)
-					_GetDirectBufferAddress = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr));
-				return _GetDirectBufferAddress;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long _GetDirectBufferCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long GetDirectBufferCapacity {
-			get {
-				if (_GetDirectBufferCapacity == null)
-					_GetDirectBufferCapacity = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long));
-				return _GetDirectBufferCapacity;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType _GetObjectRefType;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType GetObjectRefType {
-			get {
-				if (_GetObjectRefType == null)
-					_GetObjectRefType = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType));
-				return _GetObjectRefType;
-			}
-		}
-	}
-}
-#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES
-#if FEATURE_HANDLES_ARE_INTPTRS
-namespace
-#if _NAMESPACE_PER_HANDLE
-	Java.Interop.IntPtrs
-#else
-	Java.Interop
-#endif
-{
-
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int (JNIEnvPtr env);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_string_IntPtr_IntPtr_int_jobject (JNIEnvPtr env, string name, IntPtr loader, IntPtr buf, int bufLen);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_string_jobject (JNIEnvPtr env, string classname);
-	unsafe delegate jinstanceMethodID JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID (JNIEnvPtr env, IntPtr method);
-	unsafe delegate jinstanceFieldID JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID (JNIEnvPtr env, IntPtr field);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool_jobject (JNIEnvPtr env, IntPtr cls, jinstanceMethodID jmethod, bool isStatic);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject (JNIEnvPtr env, IntPtr jclass);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool (JNIEnvPtr env, IntPtr clazz1, IntPtr clazz2);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool_jobject (JNIEnvPtr env, IntPtr cls, jinstanceFieldID jfieldID, bool isStatic);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_int (JNIEnvPtr env, IntPtr obj);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_string_int (JNIEnvPtr env, IntPtr clazz, string message);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject (JNIEnvPtr env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle (JNIEnvPtr env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_string (JNIEnvPtr env, string msg);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int_int (JNIEnvPtr env, int capacity);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr (JNIEnvPtr env, IntPtr jobject);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject (JNIEnvPtr env, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject (JNIEnvPtr env, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jinstanceMethodID JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceMethodID (JNIEnvPtr env, IntPtr kls, string name, string signature);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_bool (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_sbyte (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_sbyte (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_char (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_char (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_short (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_short (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_int (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_int (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_long (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_long (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_float (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_float (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_double (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_double (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef (JNIEnvPtr env, IntPtr jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_jobject (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_jobject (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_bool (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_bool (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_sbyte (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_sbyte (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_char (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_char (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_short (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_short (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_int (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_int (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_long (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_long (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_float (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_float (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_double (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_double (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef (JNIEnvPtr env, IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jinstanceFieldID JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceFieldID (JNIEnvPtr env, IntPtr jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_jobject (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_IntPtr (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, IntPtr val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double (JNIEnvPtr env, IntPtr jobject, jinstanceFieldID jfieldID, double val);
-	unsafe delegate jstaticMethodID JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticMethodID (JNIEnvPtr env, IntPtr jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_jobject (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_jobject (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_bool (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_bool (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_sbyte (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_sbyte (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_char (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_char (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_short (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_short (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_int (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_int (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_long (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_long (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_float (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_float (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_double (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_double (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef (JNIEnvPtr env, IntPtr jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate jstaticFieldID JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticFieldID (JNIEnvPtr env, IntPtr jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_jobject (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_IntPtr (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, IntPtr val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double (JNIEnvPtr env, IntPtr jclass, jstaticFieldID jfieldID, double val);
-	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject (JNIEnvPtr env, IntPtr unicodeChars, int len);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr (JNIEnvPtr env, IntPtr @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr (JNIEnvPtr env, IntPtr @string, IntPtr chars);
-	unsafe delegate string JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string (JNIEnvPtr env, IntPtr @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_string (JNIEnvPtr env, IntPtr @string, string utf);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_int_IntPtr_IntPtr_jobject (JNIEnvPtr env, int length, IntPtr elementClass, IntPtr initialElement);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_int_IntPtr (JNIEnvPtr env, IntPtr array, int index, IntPtr value);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_int_jobject (JNIEnvPtr env, int length);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int (JNIEnvPtr env, IntPtr array, IntPtr elems, int mode);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr (JNIEnvPtr env, IntPtr array, int start, int len, IntPtr buf);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_IntPtr_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, IntPtr jclass, JniNativeMethodRegistration [] methods, int nMethods);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_bool (JNIEnvPtr env);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject (JNIEnvPtr env, IntPtr address, long capacity);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr (JNIEnvPtr env, IntPtr buf);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_IntPtr_long (JNIEnvPtr env, IntPtr buf);
-	unsafe delegate JniObjectReferenceType JniFunc_JniEnvironmentSafeHandle_IntPtr_JniObjectReferenceType (JNIEnvPtr env, IntPtr jobject);
-
-	partial class JniEnvironment {
-
-	internal static partial class Activator {
-
-		public static unsafe IntPtr AllocObject (IntPtr jclass)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.SafeHandle, jclass);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewObject (IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewObject (IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-	}
-
-	public static partial class Arrays {
-
-		public static unsafe int GetArrayLength (IntPtr array_ptr)
-		{
-			if (array_ptr == IntPtr.Zero)
-				throw new ArgumentException ("`array_ptr` must not be IntPtr.Zero.", "array_ptr");
-
-			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.SafeHandle, array_ptr);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewObjectArray (int length, IntPtr elementClass, IntPtr initialElement)
-		{
-			if (elementClass == IntPtr.Zero)
-				throw new ArgumentException ("`elementClass` must not be IntPtr.Zero.", "elementClass");
-
-			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.SafeHandle, length, elementClass, initialElement);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetObjectArrayElement (IntPtr array, int index)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe void SetObjectArrayElement (IntPtr array, int index, IntPtr value)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index, value);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe IntPtr NewBooleanArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewByteArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewCharArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewShortArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewIntArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewLongArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewFloatArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr NewDoubleArray (int length)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.SafeHandle, length);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetBooleanArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetByteArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetCharArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetShortArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetIntArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetLongArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetFloatArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetDoubleArrayElements (IntPtr array, IntPtr isCopy)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
-			return tmp;
-		}
-
-		public static unsafe void ReleaseBooleanArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseByteArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseCharArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseShortArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseIntArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseLongArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseFloatArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		public static unsafe void ReleaseDoubleArrayElements (IntPtr array, IntPtr elems, int mode)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
-
-			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
-		}
-
-		internal static unsafe void GetBooleanArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetByteArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetCharArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetShortArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetIntArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetLongArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetFloatArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void GetDoubleArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void SetBooleanArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetByteArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetCharArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetShortArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetIntArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetLongArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetFloatArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe void SetDoubleArrayRegion (IntPtr array, int start, int len, IntPtr buf)
-		{
-			if (array == IntPtr.Zero)
-				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-	}
-
-	public static partial class Errors {
-
-		public static unsafe int Throw (IntPtr obj)
-		{
-			if (obj == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
-
-			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-
-		public static unsafe int ThrowNew (IntPtr clazz, string message)
-		{
-			if (clazz == IntPtr.Zero)
-				throw new ArgumentException ("`clazz` must not be IntPtr.Zero.", "clazz");
-			if (message == null)
-				throw new ArgumentNullException ("message");
-
-			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.SafeHandle, clazz, message);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr ExceptionOccurred ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-
-		internal static unsafe void ExceptionDescribe ()
-		{
-			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.SafeHandle);
-		}
-
-		internal static unsafe void ExceptionClear ()
-		{
-			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.SafeHandle);
-		}
-
-		public static unsafe void FatalError (string msg)
-		{
-			if (msg == null)
-				throw new ArgumentNullException ("msg");
-
-			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.SafeHandle, msg);
-		}
-
-		internal static unsafe bool ExceptionCheck ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-	}
-
-	public static partial class Handles {
-
-		public static unsafe int PushLocalFrame (int capacity)
-		{
-			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
-		}
-
-		public static unsafe IntPtr PopLocalFrame (IntPtr result)
-		{
-			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.SafeHandle, result);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr NewGlobalRef (IntPtr jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		internal static unsafe void DeleteGlobalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe void DeleteLocalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe IntPtr NewLocalRef (IntPtr jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		public static unsafe int EnsureLocalCapacity (int capacity)
-		{
-			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
-		}
-
-		public static unsafe int GetJavaVM (out IntPtr vm)
-		{
-			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.SafeHandle, out vm);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr NewWeakGlobalRef (IntPtr jobject)
-		{
-			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-
-		internal static unsafe void DeleteWeakGlobalRef (IntPtr jobject)
-		{
-			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
-		}
-
-		internal static unsafe JniObjectReferenceType GetObjectRefType (IntPtr jobject)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
-		}
-	}
-
-	public static partial class IO {
-
-		public static unsafe IntPtr NewDirectByteBuffer (IntPtr address, long capacity)
-		{
-			if (address == IntPtr.Zero)
-				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
-
-			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.SafeHandle, address, capacity);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetDirectBufferAddress (IntPtr buf)
-		{
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("`buf` must not be IntPtr.Zero.", "buf");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
-		}
-
-		public static unsafe long GetDirectBufferCapacity (IntPtr buf)
-		{
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("`buf` must not be IntPtr.Zero.", "buf");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
-		}
-	}
-
-	internal static partial class Members {
-
-		internal static unsafe IntPtr ToReflectedMethod (IntPtr cls, jinstanceMethodID jmethod, bool isStatic)
-		{
-			if (cls == IntPtr.Zero)
-				throw new ArgumentException ("`cls` must not be IntPtr.Zero.", "cls");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.SafeHandle, cls, jmethod, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr ToReflectedField (IntPtr cls, jinstanceFieldID jfieldID, bool isStatic)
-		{
-			if (cls == IntPtr.Zero)
-				throw new ArgumentException ("`cls` must not be IntPtr.Zero.", "cls");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.SafeHandle, cls, jfieldID, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe jinstanceMethodID GetMethodID (IntPtr kls, string name, string signature)
-		{
-			if (kls == IntPtr.Zero)
-				throw new ArgumentException ("`kls` must not be IntPtr.Zero.", "kls");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (signature == null)
-				throw new ArgumentNullException ("signature");
-
-			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.SafeHandle, kls, name, signature);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe IntPtr CallObjectMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr CallObjectMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallBooleanMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallBooleanMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallSByteMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallSByteMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallCharMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallCharMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallShortMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallShortMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallIntMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallIntMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallLongMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallLongMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallFloatMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallFloatMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallDoubleMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallDoubleMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallVoidMethod (IntPtr jobject, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallVoidMethod (IntPtr jobject, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe IntPtr CallNonvirtualObjectMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr CallNonvirtualObjectMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallNonvirtualBooleanMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallNonvirtualBooleanMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallNonvirtualSByteMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallNonvirtualSByteMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallNonvirtualCharMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallNonvirtualCharMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallNonvirtualShortMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallNonvirtualShortMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallNonvirtualIntMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallNonvirtualIntMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallNonvirtualLongMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallNonvirtualLongMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallNonvirtualFloatMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallNonvirtualFloatMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallNonvirtualDoubleMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallNonvirtualDoubleMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallNonvirtualVoidMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallNonvirtualVoidMethod (IntPtr jobject, IntPtr jclass, jinstanceMethodID jmethod, JValue* parms)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe jinstanceFieldID GetFieldID (IntPtr jclass, string name, string sig)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe IntPtr GetObjectField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool GetBooleanField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe sbyte GetByteField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe char GetCharField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe short GetShortField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe int GetIntField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe long GetLongField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe float GetFloatField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe double GetDoubleField (IntPtr jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, IntPtr val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, bool val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, sbyte val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, char val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, short val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, int val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, long val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, float val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		internal static unsafe void SetField (IntPtr jobject, jinstanceFieldID jfieldID, double val)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
-		}
-
-		public static unsafe jstaticMethodID GetStaticMethodID (IntPtr jclass, string name, string sig)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe IntPtr CallStaticObjectMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr CallStaticObjectMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool CallStaticBooleanMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe bool CallStaticBooleanMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallStaticSByteMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe sbyte CallStaticSByteMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallStaticCharMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe char CallStaticCharMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallStaticShortMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe short CallStaticShortMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallStaticIntMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int CallStaticIntMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallStaticLongMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe long CallStaticLongMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallStaticFloatMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe float CallStaticFloatMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallStaticDoubleMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe double CallStaticDoubleMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe void CallStaticVoidMethod (IntPtr jclass, jstaticMethodID jmethod)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		internal static unsafe void CallStaticVoidMethod (IntPtr jclass, jstaticMethodID jmethod, JValue* parms)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-		}
-
-		public static unsafe jstaticFieldID GetStaticFieldID (IntPtr jclass, string name, string sig)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe IntPtr GetStaticObjectField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe bool GetStaticBooleanField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe sbyte GetStaticByteField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe char GetStaticCharField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe short GetStaticShortField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe int GetStaticIntField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe long GetStaticLongField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe float GetStaticFloatField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe double GetStaticDoubleField (IntPtr jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, IntPtr val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, bool val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, sbyte val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, char val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, short val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, int val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, long val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, float val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (IntPtr jclass, jstaticFieldID jfieldID, double val)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-	}
-
-	internal static partial class Monitors {
-
-		public static unsafe int MonitorEnter (IntPtr obj)
-		{
-			if (obj == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-
-		public static unsafe int MonitorExit (IntPtr obj)
-		{
-			if (obj == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-	}
-
-	public static partial class Strings {
-
-		internal static unsafe IntPtr NewString (IntPtr unicodeChars, int len)
-		{
-			if (unicodeChars == IntPtr.Zero)
-				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
-
-			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.SafeHandle, unicodeChars, len);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe int GetStringLength (IntPtr @string)
-		{
-			if (@string == IntPtr.Zero)
-				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.SafeHandle, @string);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr GetStringChars (IntPtr @string, IntPtr isCopy)
-		{
-			if (@string == IntPtr.Zero)
-				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.SafeHandle, @string, isCopy);
-			return tmp;
-		}
-
-		internal static unsafe void ReleaseStringChars (IntPtr @string, IntPtr chars)
-		{
-			if (@string == IntPtr.Zero)
-				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
-			if (chars == IntPtr.Zero)
-				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
-
-			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.SafeHandle, @string, chars);
-		}
-	}
-
-	public static partial class Types {
-
-		internal static unsafe IntPtr DefineClass (string name, IntPtr loader, IntPtr buf, int bufLen)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (loader == IntPtr.Zero)
-				throw new ArgumentException ("`loader` must not be IntPtr.Zero.", "loader");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
-
-			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.SafeHandle, name, loader, buf, bufLen);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr FindClass (string classname)
-		{
-			if (classname == null)
-				throw new ArgumentNullException ("classname");
-
-			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.SafeHandle, classname);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetSuperclass (IntPtr jclass)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.SafeHandle, jclass);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe bool IsAssignableFrom (IntPtr clazz1, IntPtr clazz2)
-		{
-			if (clazz1 == IntPtr.Zero)
-				throw new ArgumentException ("`clazz1` must not be IntPtr.Zero.", "clazz1");
-			if (clazz2 == IntPtr.Zero)
-				throw new ArgumentException ("`clazz2` must not be IntPtr.Zero.", "clazz2");
-
-			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.SafeHandle, clazz1, clazz2);
-			return tmp;
-		}
-
-		public static unsafe bool IsSameObject (IntPtr ref1, IntPtr ref2)
-		{
-			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.SafeHandle, ref1, ref2);
-			return tmp;
-		}
-
-		public static unsafe IntPtr GetObjectClass (IntPtr jobject)
-		{
-			if (jobject == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.SafeHandle, jobject);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		public static unsafe bool IsInstanceOf (IntPtr obj, IntPtr clazz)
-		{
-			if (obj == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
-			if (clazz == IntPtr.Zero)
-				throw new ArgumentException ("`clazz` must not be IntPtr.Zero.", "clazz");
-
-			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.SafeHandle, obj, clazz);
-			return tmp;
-		}
-
-		internal static unsafe int RegisterNatives (IntPtr jclass, JniNativeMethodRegistration [] methods, int nMethods)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.SafeHandle, jclass, methods, nMethods);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			return tmp;
-		}
-
-		internal static unsafe int UnregisterNatives (IntPtr jclass)
-		{
-			if (jclass == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-
-			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.SafeHandle, jclass);
-			return tmp;
-		}
-	}
-
-	internal static partial class Versions {
-
-		internal static unsafe int GetVersion ()
-		{
-			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.SafeHandle);
-			return tmp;
-		}
-	}
-	}
-
-	partial class JniEnvironmentInvoker {
-
-		internal JniNativeInterfaceStruct env;
-
-		public unsafe JniEnvironmentInvoker (JniNativeInterfaceStruct* p)
-		{
-			env = *p;
-		}
-
-
-		JniFunc_JniEnvironmentSafeHandle_int _GetVersion;
-		public JniFunc_JniEnvironmentSafeHandle_int GetVersion {
-			get {
-				if (_GetVersion == null)
-					_GetVersion = (JniFunc_JniEnvironmentSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JniEnvironmentSafeHandle_int));
-				return _GetVersion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_IntPtr_IntPtr_int_jobject _DefineClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_IntPtr_IntPtr_int_jobject DefineClass {
-			get {
-				if (_DefineClass == null)
-					_DefineClass = (JniFunc_JniEnvironmentSafeHandle_string_IntPtr_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_IntPtr_IntPtr_int_jobject));
-				return _DefineClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_jobject _FindClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_jobject FindClass {
-			get {
-				if (_FindClass == null)
-					_FindClass = (JniFunc_JniEnvironmentSafeHandle_string_jobject) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_jobject));
-				return _FindClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID _FromReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID FromReflectedMethod {
-			get {
-				if (_FromReflectedMethod == null)
-					_FromReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID));
-				return _FromReflectedMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID _FromReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID FromReflectedField {
-			get {
-				if (_FromReflectedField == null)
-					_FromReflectedField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID));
-				return _FromReflectedField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool_jobject _ToReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool_jobject ToReflectedMethod {
-			get {
-				if (_ToReflectedMethod == null)
-					_ToReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool_jobject));
-				return _ToReflectedMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _GetSuperclass;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject GetSuperclass {
-			get {
-				if (_GetSuperclass == null)
-					_GetSuperclass = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _GetSuperclass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool _IsAssignableFrom;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool IsAssignableFrom {
-			get {
-				if (_IsAssignableFrom == null)
-					_IsAssignableFrom = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool));
-				return _IsAssignableFrom;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool_jobject _ToReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool_jobject ToReflectedField {
-			get {
-				if (_ToReflectedField == null)
-					_ToReflectedField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool_jobject));
-				return _ToReflectedField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _Throw;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int Throw {
-			get {
-				if (_Throw == null)
-					_Throw = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _Throw;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_string_int _ThrowNew;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_string_int ThrowNew {
-			get {
-				if (_ThrowNew == null)
-					_ThrowNew = (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_int));
-				return _ThrowNew;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_jobject _ExceptionOccurred;
-		public JniFunc_JniEnvironmentSafeHandle_jobject ExceptionOccurred {
-			get {
-				if (_ExceptionOccurred == null)
-					_ExceptionOccurred = (JniFunc_JniEnvironmentSafeHandle_jobject) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JniEnvironmentSafeHandle_jobject));
-				return _ExceptionOccurred;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle _ExceptionDescribe;
-		public JniAction_JniEnvironmentSafeHandle ExceptionDescribe {
-			get {
-				if (_ExceptionDescribe == null)
-					_ExceptionDescribe = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JniEnvironmentSafeHandle));
-				return _ExceptionDescribe;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle _ExceptionClear;
-		public JniAction_JniEnvironmentSafeHandle ExceptionClear {
-			get {
-				if (_ExceptionClear == null)
-					_ExceptionClear = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JniEnvironmentSafeHandle));
-				return _ExceptionClear;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_string _FatalError;
-		public JniAction_JniEnvironmentSafeHandle_string FatalError {
-			get {
-				if (_FatalError == null)
-					_FatalError = (JniAction_JniEnvironmentSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JniEnvironmentSafeHandle_string));
-				return _FatalError;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_int _PushLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_int_int PushLocalFrame {
-			get {
-				if (_PushLocalFrame == null)
-					_PushLocalFrame = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
-				return _PushLocalFrame;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _PopLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject PopLocalFrame {
-			get {
-				if (_PopLocalFrame == null)
-					_PopLocalFrame = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _PopLocalFrame;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _NewGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject NewGlobalRef {
-			get {
-				if (_NewGlobalRef == null)
-					_NewGlobalRef = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _NewGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteGlobalRef {
-			get {
-				if (_DeleteGlobalRef == null)
-					_DeleteGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteLocalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteLocalRef {
-			get {
-				if (_DeleteLocalRef == null)
-					_DeleteLocalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteLocalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool _IsSameObject;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool IsSameObject {
-			get {
-				if (_IsSameObject == null)
-					_IsSameObject = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool));
-				return _IsSameObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _NewLocalRef;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject NewLocalRef {
-			get {
-				if (_NewLocalRef == null)
-					_NewLocalRef = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _NewLocalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_int _EnsureLocalCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_int_int EnsureLocalCapacity {
-			get {
-				if (_EnsureLocalCapacity == null)
-					_EnsureLocalCapacity = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
-				return _EnsureLocalCapacity;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _AllocObject;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject AllocObject {
-			get {
-				if (_AllocObject == null)
-					_AllocObject = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _AllocObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject _NewObject;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject NewObject {
-			get {
-				if (_NewObject == null)
-					_NewObject = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject));
-				return _NewObject;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject _NewObjectA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject NewObjectA {
-			get {
-				if (_NewObjectA == null)
-					_NewObjectA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject));
-				return _NewObjectA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _GetObjectClass;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject GetObjectClass {
-			get {
-				if (_GetObjectClass == null)
-					_GetObjectClass = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _GetObjectClass;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool _IsInstanceOf;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool IsInstanceOf {
-			get {
-				if (_IsInstanceOf == null)
-					_IsInstanceOf = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_bool));
-				return _IsInstanceOf;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceMethodID _GetMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceMethodID GetMethodID {
-			get {
-				if (_GetMethodID == null)
-					_GetMethodID = (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceMethodID));
-				return _GetMethodID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject _CallObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject CallObjectMethod {
-			get {
-				if (_CallObjectMethod == null)
-					_CallObjectMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_jobject));
-				return _CallObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject _CallObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject CallObjectMethodA {
-			get {
-				if (_CallObjectMethodA == null)
-					_CallObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_jobject));
-				return _CallObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool _CallBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool CallBooleanMethod {
-			get {
-				if (_CallBooleanMethod == null)
-					_CallBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_bool));
-				return _CallBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_bool _CallBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_bool CallBooleanMethodA {
-			get {
-				if (_CallBooleanMethodA == null)
-					_CallBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_bool));
-				return _CallBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_sbyte _CallSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_sbyte CallSByteMethod {
-			get {
-				if (_CallSByteMethod == null)
-					_CallSByteMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_sbyte));
-				return _CallSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_sbyte _CallSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_sbyte CallSByteMethodA {
-			get {
-				if (_CallSByteMethodA == null)
-					_CallSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_sbyte));
-				return _CallSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_char _CallCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_char CallCharMethod {
-			get {
-				if (_CallCharMethod == null)
-					_CallCharMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_char));
-				return _CallCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_char _CallCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_char CallCharMethodA {
-			get {
-				if (_CallCharMethodA == null)
-					_CallCharMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_char));
-				return _CallCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_short _CallShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_short CallShortMethod {
-			get {
-				if (_CallShortMethod == null)
-					_CallShortMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_short));
-				return _CallShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_short _CallShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_short CallShortMethodA {
-			get {
-				if (_CallShortMethodA == null)
-					_CallShortMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_short));
-				return _CallShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_int _CallIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_int CallIntMethod {
-			get {
-				if (_CallIntMethod == null)
-					_CallIntMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_int));
-				return _CallIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_int _CallIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_int CallIntMethodA {
-			get {
-				if (_CallIntMethodA == null)
-					_CallIntMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_int));
-				return _CallIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_long _CallLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_long CallLongMethod {
-			get {
-				if (_CallLongMethod == null)
-					_CallLongMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_long));
-				return _CallLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_long _CallLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_long CallLongMethodA {
-			get {
-				if (_CallLongMethodA == null)
-					_CallLongMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_long));
-				return _CallLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_float _CallFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_float CallFloatMethod {
-			get {
-				if (_CallFloatMethod == null)
-					_CallFloatMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_float));
-				return _CallFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_float _CallFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_float CallFloatMethodA {
-			get {
-				if (_CallFloatMethodA == null)
-					_CallFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_float));
-				return _CallFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_double _CallDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_double CallDoubleMethod {
-			get {
-				if (_CallDoubleMethod == null)
-					_CallDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_double));
-				return _CallDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_double _CallDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_double CallDoubleMethodA {
-			get {
-				if (_CallDoubleMethodA == null)
-					_CallDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef_double));
-				return _CallDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID _CallVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID CallVoidMethod {
-			get {
-				if (_CallVoidMethod == null)
-					_CallVoidMethod = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID));
-				return _CallVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef _CallVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef CallVoidMethodA {
-			get {
-				if (_CallVoidMethodA == null)
-					_CallVoidMethodA = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceMethodID_JValueRef));
-				return _CallVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_jobject _CallNonvirtualObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_jobject CallNonvirtualObjectMethod {
-			get {
-				if (_CallNonvirtualObjectMethod == null)
-					_CallNonvirtualObjectMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_jobject));
-				return _CallNonvirtualObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_jobject _CallNonvirtualObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_jobject CallNonvirtualObjectMethodA {
-			get {
-				if (_CallNonvirtualObjectMethodA == null)
-					_CallNonvirtualObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_jobject));
-				return _CallNonvirtualObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_bool _CallNonvirtualBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_bool CallNonvirtualBooleanMethod {
-			get {
-				if (_CallNonvirtualBooleanMethod == null)
-					_CallNonvirtualBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_bool));
-				return _CallNonvirtualBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_bool _CallNonvirtualBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_bool CallNonvirtualBooleanMethodA {
-			get {
-				if (_CallNonvirtualBooleanMethodA == null)
-					_CallNonvirtualBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_bool));
-				return _CallNonvirtualBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_sbyte _CallNonvirtualSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_sbyte CallNonvirtualSByteMethod {
-			get {
-				if (_CallNonvirtualSByteMethod == null)
-					_CallNonvirtualSByteMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_sbyte));
-				return _CallNonvirtualSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_sbyte _CallNonvirtualSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_sbyte CallNonvirtualSByteMethodA {
-			get {
-				if (_CallNonvirtualSByteMethodA == null)
-					_CallNonvirtualSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_sbyte));
-				return _CallNonvirtualSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_char _CallNonvirtualCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_char CallNonvirtualCharMethod {
-			get {
-				if (_CallNonvirtualCharMethod == null)
-					_CallNonvirtualCharMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_char));
-				return _CallNonvirtualCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_char _CallNonvirtualCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_char CallNonvirtualCharMethodA {
-			get {
-				if (_CallNonvirtualCharMethodA == null)
-					_CallNonvirtualCharMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_char));
-				return _CallNonvirtualCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_short _CallNonvirtualShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_short CallNonvirtualShortMethod {
-			get {
-				if (_CallNonvirtualShortMethod == null)
-					_CallNonvirtualShortMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_short));
-				return _CallNonvirtualShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_short _CallNonvirtualShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_short CallNonvirtualShortMethodA {
-			get {
-				if (_CallNonvirtualShortMethodA == null)
-					_CallNonvirtualShortMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_short));
-				return _CallNonvirtualShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_int _CallNonvirtualIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_int CallNonvirtualIntMethod {
-			get {
-				if (_CallNonvirtualIntMethod == null)
-					_CallNonvirtualIntMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_int));
-				return _CallNonvirtualIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_int _CallNonvirtualIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_int CallNonvirtualIntMethodA {
-			get {
-				if (_CallNonvirtualIntMethodA == null)
-					_CallNonvirtualIntMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_int));
-				return _CallNonvirtualIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_long _CallNonvirtualLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_long CallNonvirtualLongMethod {
-			get {
-				if (_CallNonvirtualLongMethod == null)
-					_CallNonvirtualLongMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_long));
-				return _CallNonvirtualLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_long _CallNonvirtualLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_long CallNonvirtualLongMethodA {
-			get {
-				if (_CallNonvirtualLongMethodA == null)
-					_CallNonvirtualLongMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_long));
-				return _CallNonvirtualLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_float _CallNonvirtualFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_float CallNonvirtualFloatMethod {
-			get {
-				if (_CallNonvirtualFloatMethod == null)
-					_CallNonvirtualFloatMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_float));
-				return _CallNonvirtualFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_float _CallNonvirtualFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_float CallNonvirtualFloatMethodA {
-			get {
-				if (_CallNonvirtualFloatMethodA == null)
-					_CallNonvirtualFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_float));
-				return _CallNonvirtualFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_double _CallNonvirtualDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_double CallNonvirtualDoubleMethod {
-			get {
-				if (_CallNonvirtualDoubleMethod == null)
-					_CallNonvirtualDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_double));
-				return _CallNonvirtualDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_double _CallNonvirtualDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_double CallNonvirtualDoubleMethodA {
-			get {
-				if (_CallNonvirtualDoubleMethodA == null)
-					_CallNonvirtualDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef_double));
-				return _CallNonvirtualDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID _CallNonvirtualVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID CallNonvirtualVoidMethod {
-			get {
-				if (_CallNonvirtualVoidMethod == null)
-					_CallNonvirtualVoidMethod = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID));
-				return _CallNonvirtualVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef _CallNonvirtualVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef CallNonvirtualVoidMethodA {
-			get {
-				if (_CallNonvirtualVoidMethodA == null)
-					_CallNonvirtualVoidMethodA = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_jinstanceMethodID_JValueRef));
-				return _CallNonvirtualVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceFieldID _GetFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceFieldID GetFieldID {
-			get {
-				if (_GetFieldID == null)
-					_GetFieldID = (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jinstanceFieldID));
-				return _GetFieldID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_jobject _GetObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_jobject GetObjectField {
-			get {
-				if (_GetObjectField == null)
-					_GetObjectField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_jobject));
-				return _GetObjectField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool _GetBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool GetBooleanField {
-			get {
-				if (_GetBooleanField == null)
-					_GetBooleanField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool));
-				return _GetBooleanField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte _GetByteField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte GetByteField {
-			get {
-				if (_GetByteField == null)
-					_GetByteField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte));
-				return _GetByteField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char _GetCharField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char GetCharField {
-			get {
-				if (_GetCharField == null)
-					_GetCharField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char));
-				return _GetCharField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short _GetShortField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short GetShortField {
-			get {
-				if (_GetShortField == null)
-					_GetShortField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short));
-				return _GetShortField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int _GetIntField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int GetIntField {
-			get {
-				if (_GetIntField == null)
-					_GetIntField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int));
-				return _GetIntField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long _GetLongField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long GetLongField {
-			get {
-				if (_GetLongField == null)
-					_GetLongField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long));
-				return _GetLongField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float _GetFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float GetFloatField {
-			get {
-				if (_GetFloatField == null)
-					_GetFloatField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float));
-				return _GetFloatField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double _GetDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double GetDoubleField {
-			get {
-				if (_GetDoubleField == null)
-					_GetDoubleField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double));
-				return _GetDoubleField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_IntPtr _SetObjectField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_IntPtr SetObjectField {
-			get {
-				if (_SetObjectField == null)
-					_SetObjectField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_IntPtr));
-				return _SetObjectField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool _SetBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool SetBooleanField {
-			get {
-				if (_SetBooleanField == null)
-					_SetBooleanField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_bool));
-				return _SetBooleanField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte _SetByteField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte SetByteField {
-			get {
-				if (_SetByteField == null)
-					_SetByteField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_sbyte));
-				return _SetByteField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char _SetCharField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char SetCharField {
-			get {
-				if (_SetCharField == null)
-					_SetCharField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_char));
-				return _SetCharField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short _SetShortField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short SetShortField {
-			get {
-				if (_SetShortField == null)
-					_SetShortField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_short));
-				return _SetShortField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int _SetIntField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int SetIntField {
-			get {
-				if (_SetIntField == null)
-					_SetIntField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_int));
-				return _SetIntField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long _SetLongField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long SetLongField {
-			get {
-				if (_SetLongField == null)
-					_SetLongField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_long));
-				return _SetLongField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float _SetFloatField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float SetFloatField {
-			get {
-				if (_SetFloatField == null)
-					_SetFloatField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_float));
-				return _SetFloatField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double _SetDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double SetDoubleField {
-			get {
-				if (_SetDoubleField == null)
-					_SetDoubleField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jinstanceFieldID_double));
-				return _SetDoubleField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticMethodID _GetStaticMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticMethodID GetStaticMethodID {
-			get {
-				if (_GetStaticMethodID == null)
-					_GetStaticMethodID = (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticMethodID) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticMethodID));
-				return _GetStaticMethodID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_jobject _CallStaticObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_jobject CallStaticObjectMethod {
-			get {
-				if (_CallStaticObjectMethod == null)
-					_CallStaticObjectMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_jobject));
-				return _CallStaticObjectMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_jobject _CallStaticObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_jobject CallStaticObjectMethodA {
-			get {
-				if (_CallStaticObjectMethodA == null)
-					_CallStaticObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_jobject));
-				return _CallStaticObjectMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_bool _CallStaticBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_bool CallStaticBooleanMethod {
-			get {
-				if (_CallStaticBooleanMethod == null)
-					_CallStaticBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_bool));
-				return _CallStaticBooleanMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_bool _CallStaticBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_bool CallStaticBooleanMethodA {
-			get {
-				if (_CallStaticBooleanMethodA == null)
-					_CallStaticBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_bool));
-				return _CallStaticBooleanMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_sbyte _CallStaticSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_sbyte CallStaticSByteMethod {
-			get {
-				if (_CallStaticSByteMethod == null)
-					_CallStaticSByteMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_sbyte));
-				return _CallStaticSByteMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_sbyte _CallStaticSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_sbyte CallStaticSByteMethodA {
-			get {
-				if (_CallStaticSByteMethodA == null)
-					_CallStaticSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_sbyte));
-				return _CallStaticSByteMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_char _CallStaticCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_char CallStaticCharMethod {
-			get {
-				if (_CallStaticCharMethod == null)
-					_CallStaticCharMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_char));
-				return _CallStaticCharMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_char _CallStaticCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_char CallStaticCharMethodA {
-			get {
-				if (_CallStaticCharMethodA == null)
-					_CallStaticCharMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_char));
-				return _CallStaticCharMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_short _CallStaticShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_short CallStaticShortMethod {
-			get {
-				if (_CallStaticShortMethod == null)
-					_CallStaticShortMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_short));
-				return _CallStaticShortMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_short _CallStaticShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_short CallStaticShortMethodA {
-			get {
-				if (_CallStaticShortMethodA == null)
-					_CallStaticShortMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_short));
-				return _CallStaticShortMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_int _CallStaticIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_int CallStaticIntMethod {
-			get {
-				if (_CallStaticIntMethod == null)
-					_CallStaticIntMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_int));
-				return _CallStaticIntMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_int _CallStaticIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_int CallStaticIntMethodA {
-			get {
-				if (_CallStaticIntMethodA == null)
-					_CallStaticIntMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_int));
-				return _CallStaticIntMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_long _CallStaticLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_long CallStaticLongMethod {
-			get {
-				if (_CallStaticLongMethod == null)
-					_CallStaticLongMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_long));
-				return _CallStaticLongMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_long _CallStaticLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_long CallStaticLongMethodA {
-			get {
-				if (_CallStaticLongMethodA == null)
-					_CallStaticLongMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_long));
-				return _CallStaticLongMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_float _CallStaticFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_float CallStaticFloatMethod {
-			get {
-				if (_CallStaticFloatMethod == null)
-					_CallStaticFloatMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_float));
-				return _CallStaticFloatMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_float _CallStaticFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_float CallStaticFloatMethodA {
-			get {
-				if (_CallStaticFloatMethodA == null)
-					_CallStaticFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_float));
-				return _CallStaticFloatMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_double _CallStaticDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_double CallStaticDoubleMethod {
-			get {
-				if (_CallStaticDoubleMethod == null)
-					_CallStaticDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_double));
-				return _CallStaticDoubleMethod;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_double _CallStaticDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_double CallStaticDoubleMethodA {
-			get {
-				if (_CallStaticDoubleMethodA == null)
-					_CallStaticDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef_double));
-				return _CallStaticDoubleMethodA;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID _CallStaticVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID CallStaticVoidMethod {
-			get {
-				if (_CallStaticVoidMethod == null)
-					_CallStaticVoidMethod = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID));
-				return _CallStaticVoidMethod;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef _CallStaticVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef CallStaticVoidMethodA {
-			get {
-				if (_CallStaticVoidMethodA == null)
-					_CallStaticVoidMethodA = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticMethodID_JValueRef));
-				return _CallStaticVoidMethodA;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticFieldID _GetStaticFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticFieldID GetStaticFieldID {
-			get {
-				if (_GetStaticFieldID == null)
-					_GetStaticFieldID = (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticFieldID) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_string_string_jstaticFieldID));
-				return _GetStaticFieldID;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_jobject _GetStaticObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_jobject GetStaticObjectField {
-			get {
-				if (_GetStaticObjectField == null)
-					_GetStaticObjectField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_jobject));
-				return _GetStaticObjectField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool _GetStaticBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool GetStaticBooleanField {
-			get {
-				if (_GetStaticBooleanField == null)
-					_GetStaticBooleanField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool));
-				return _GetStaticBooleanField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte _GetStaticByteField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte GetStaticByteField {
-			get {
-				if (_GetStaticByteField == null)
-					_GetStaticByteField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte));
-				return _GetStaticByteField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char _GetStaticCharField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char GetStaticCharField {
-			get {
-				if (_GetStaticCharField == null)
-					_GetStaticCharField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char));
-				return _GetStaticCharField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short _GetStaticShortField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short GetStaticShortField {
-			get {
-				if (_GetStaticShortField == null)
-					_GetStaticShortField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short));
-				return _GetStaticShortField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int _GetStaticIntField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int GetStaticIntField {
-			get {
-				if (_GetStaticIntField == null)
-					_GetStaticIntField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int));
-				return _GetStaticIntField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long _GetStaticLongField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long GetStaticLongField {
-			get {
-				if (_GetStaticLongField == null)
-					_GetStaticLongField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long));
-				return _GetStaticLongField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float _GetStaticFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float GetStaticFloatField {
-			get {
-				if (_GetStaticFloatField == null)
-					_GetStaticFloatField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float));
-				return _GetStaticFloatField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double _GetStaticDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double GetStaticDoubleField {
-			get {
-				if (_GetStaticDoubleField == null)
-					_GetStaticDoubleField = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double));
-				return _GetStaticDoubleField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_IntPtr _SetStaticObjectField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_IntPtr SetStaticObjectField {
-			get {
-				if (_SetStaticObjectField == null)
-					_SetStaticObjectField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_IntPtr));
-				return _SetStaticObjectField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool _SetStaticBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool SetStaticBooleanField {
-			get {
-				if (_SetStaticBooleanField == null)
-					_SetStaticBooleanField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_bool));
-				return _SetStaticBooleanField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte _SetStaticByteField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte SetStaticByteField {
-			get {
-				if (_SetStaticByteField == null)
-					_SetStaticByteField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_sbyte));
-				return _SetStaticByteField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char _SetStaticCharField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char SetStaticCharField {
-			get {
-				if (_SetStaticCharField == null)
-					_SetStaticCharField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_char));
-				return _SetStaticCharField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short _SetStaticShortField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short SetStaticShortField {
-			get {
-				if (_SetStaticShortField == null)
-					_SetStaticShortField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_short));
-				return _SetStaticShortField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int _SetStaticIntField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int SetStaticIntField {
-			get {
-				if (_SetStaticIntField == null)
-					_SetStaticIntField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_int));
-				return _SetStaticIntField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long _SetStaticLongField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long SetStaticLongField {
-			get {
-				if (_SetStaticLongField == null)
-					_SetStaticLongField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_long));
-				return _SetStaticLongField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float _SetStaticFloatField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float SetStaticFloatField {
-			get {
-				if (_SetStaticFloatField == null)
-					_SetStaticFloatField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_float));
-				return _SetStaticFloatField;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double _SetStaticDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double SetStaticDoubleField {
-			get {
-				if (_SetStaticDoubleField == null)
-					_SetStaticDoubleField = (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_jstaticFieldID_double));
-				return _SetStaticDoubleField;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject _NewString;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject NewString {
-			get {
-				if (_NewString == null)
-					_NewString = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject));
-				return _NewString;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _GetStringLength;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int GetStringLength {
-			get {
-				if (_GetStringLength == null)
-					_GetStringLength = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _GetStringLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetStringChars;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetStringChars {
-			get {
-				if (_GetStringChars == null)
-					_GetStringChars = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetStringChars;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr _ReleaseStringChars;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr ReleaseStringChars {
-			get {
-				if (_ReleaseStringChars == null)
-					_ReleaseStringChars = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr));
-				return _ReleaseStringChars;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_string_jobject _NewStringUTF;
-		public JniFunc_JniEnvironmentSafeHandle_string_jobject NewStringUTF {
-			get {
-				if (_NewStringUTF == null)
-					_NewStringUTF = (JniFunc_JniEnvironmentSafeHandle_string_jobject) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JniEnvironmentSafeHandle_string_jobject));
-				return _NewStringUTF;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _GetStringUTFLength;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int GetStringUTFLength {
-			get {
-				if (_GetStringUTFLength == null)
-					_GetStringUTFLength = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _GetStringUTFLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string _GetStringUTFChars;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string GetStringUTFChars {
-			get {
-				if (_GetStringUTFChars == null)
-					_GetStringUTFChars = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string));
-				return _GetStringUTFChars;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_string _ReleaseStringUTFChars;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_string ReleaseStringUTFChars {
-			get {
-				if (_ReleaseStringUTFChars == null)
-					_ReleaseStringUTFChars = (JniAction_JniEnvironmentSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_string));
-				return _ReleaseStringUTFChars;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _GetArrayLength;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int GetArrayLength {
-			get {
-				if (_GetArrayLength == null)
-					_GetArrayLength = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _GetArrayLength;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_IntPtr_IntPtr_jobject _NewObjectArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_IntPtr_IntPtr_jobject NewObjectArray {
-			get {
-				if (_NewObjectArray == null)
-					_NewObjectArray = (JniFunc_JniEnvironmentSafeHandle_int_IntPtr_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_IntPtr_IntPtr_jobject));
-				return _NewObjectArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject _GetObjectArrayElement;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject GetObjectArrayElement {
-			get {
-				if (_GetObjectArrayElement == null)
-					_GetObjectArrayElement = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject));
-				return _GetObjectArrayElement;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_IntPtr _SetObjectArrayElement;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_IntPtr SetObjectArrayElement {
-			get {
-				if (_SetObjectArrayElement == null)
-					_SetObjectArrayElement = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_IntPtr));
-				return _SetObjectArrayElement;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewBooleanArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewBooleanArray {
-			get {
-				if (_NewBooleanArray == null)
-					_NewBooleanArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewBooleanArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewByteArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewByteArray {
-			get {
-				if (_NewByteArray == null)
-					_NewByteArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewByteArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewCharArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewCharArray {
-			get {
-				if (_NewCharArray == null)
-					_NewCharArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewCharArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewShortArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewShortArray {
-			get {
-				if (_NewShortArray == null)
-					_NewShortArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewShortArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewIntArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewIntArray {
-			get {
-				if (_NewIntArray == null)
-					_NewIntArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewIntArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewLongArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewLongArray {
-			get {
-				if (_NewLongArray == null)
-					_NewLongArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewLongArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewFloatArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewFloatArray {
-			get {
-				if (_NewFloatArray == null)
-					_NewFloatArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewFloatArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewDoubleArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewDoubleArray {
-			get {
-				if (_NewDoubleArray == null)
-					_NewDoubleArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
-				return _NewDoubleArray;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetBooleanArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetBooleanArrayElements {
-			get {
-				if (_GetBooleanArrayElements == null)
-					_GetBooleanArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetBooleanArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetByteArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetByteArrayElements {
-			get {
-				if (_GetByteArrayElements == null)
-					_GetByteArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetByteArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetCharArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetCharArrayElements {
-			get {
-				if (_GetCharArrayElements == null)
-					_GetCharArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetCharArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetShortArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetShortArrayElements {
-			get {
-				if (_GetShortArrayElements == null)
-					_GetShortArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetShortArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetIntArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetIntArrayElements {
-			get {
-				if (_GetIntArrayElements == null)
-					_GetIntArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetIntArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetLongArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetLongArrayElements {
-			get {
-				if (_GetLongArrayElements == null)
-					_GetLongArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetLongArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetFloatArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetFloatArrayElements {
-			get {
-				if (_GetFloatArrayElements == null)
-					_GetFloatArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetFloatArrayElements;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetDoubleArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetDoubleArrayElements {
-			get {
-				if (_GetDoubleArrayElements == null)
-					_GetDoubleArrayElements = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetDoubleArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseBooleanArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseBooleanArrayElements {
-			get {
-				if (_ReleaseBooleanArrayElements == null)
-					_ReleaseBooleanArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseBooleanArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseByteArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseByteArrayElements {
-			get {
-				if (_ReleaseByteArrayElements == null)
-					_ReleaseByteArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseByteArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseCharArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseCharArrayElements {
-			get {
-				if (_ReleaseCharArrayElements == null)
-					_ReleaseCharArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseCharArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseShortArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseShortArrayElements {
-			get {
-				if (_ReleaseShortArrayElements == null)
-					_ReleaseShortArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseShortArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseIntArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseIntArrayElements {
-			get {
-				if (_ReleaseIntArrayElements == null)
-					_ReleaseIntArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseIntArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseLongArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseLongArrayElements {
-			get {
-				if (_ReleaseLongArrayElements == null)
-					_ReleaseLongArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseLongArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseFloatArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseFloatArrayElements {
-			get {
-				if (_ReleaseFloatArrayElements == null)
-					_ReleaseFloatArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseFloatArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleaseDoubleArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleaseDoubleArrayElements {
-			get {
-				if (_ReleaseDoubleArrayElements == null)
-					_ReleaseDoubleArrayElements = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleaseDoubleArrayElements;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetBooleanArrayRegion {
-			get {
-				if (_GetBooleanArrayRegion == null)
-					_GetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetBooleanArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetByteArrayRegion {
-			get {
-				if (_GetByteArrayRegion == null)
-					_GetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetByteArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetCharArrayRegion {
-			get {
-				if (_GetCharArrayRegion == null)
-					_GetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetCharArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetShortArrayRegion {
-			get {
-				if (_GetShortArrayRegion == null)
-					_GetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetShortArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetIntArrayRegion {
-			get {
-				if (_GetIntArrayRegion == null)
-					_GetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetIntArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetLongArrayRegion {
-			get {
-				if (_GetLongArrayRegion == null)
-					_GetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetLongArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetFloatArrayRegion {
-			get {
-				if (_GetFloatArrayRegion == null)
-					_GetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetFloatArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetDoubleArrayRegion {
-			get {
-				if (_GetDoubleArrayRegion == null)
-					_GetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetDoubleArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetBooleanArrayRegion {
-			get {
-				if (_SetBooleanArrayRegion == null)
-					_SetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetBooleanArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetByteArrayRegion {
-			get {
-				if (_SetByteArrayRegion == null)
-					_SetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetByteArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetCharArrayRegion {
-			get {
-				if (_SetCharArrayRegion == null)
-					_SetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetCharArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetShortArrayRegion {
-			get {
-				if (_SetShortArrayRegion == null)
-					_SetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetShortArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetIntArrayRegion {
-			get {
-				if (_SetIntArrayRegion == null)
-					_SetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetIntArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetLongArrayRegion {
-			get {
-				if (_SetLongArrayRegion == null)
-					_SetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetLongArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetFloatArrayRegion {
-			get {
-				if (_SetFloatArrayRegion == null)
-					_SetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetFloatArrayRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _SetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr SetDoubleArrayRegion {
-			get {
-				if (_SetDoubleArrayRegion == null)
-					_SetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _SetDoubleArrayRegion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_JniNativeMethodRegistrationArray_int_int RegisterNatives {
-			get {
-				if (_RegisterNatives == null)
-					_RegisterNatives = (JniFunc_JniEnvironmentSafeHandle_IntPtr_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_JniNativeMethodRegistrationArray_int_int));
-				return _RegisterNatives;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _UnregisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int UnregisterNatives {
-			get {
-				if (_UnregisterNatives == null)
-					_UnregisterNatives = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _UnregisterNatives;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _MonitorEnter;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int MonitorEnter {
-			get {
-				if (_MonitorEnter == null)
-					_MonitorEnter = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _MonitorEnter;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int _MonitorExit;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int MonitorExit {
-			get {
-				if (_MonitorExit == null)
-					_MonitorExit = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int));
-				return _MonitorExit;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_outIntPtr_int _GetJavaVM;
-		public JniFunc_JniEnvironmentSafeHandle_outIntPtr_int GetJavaVM {
-			get {
-				if (_GetJavaVM == null)
-					_GetJavaVM = (JniFunc_JniEnvironmentSafeHandle_outIntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JniEnvironmentSafeHandle_outIntPtr_int));
-				return _GetJavaVM;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetStringRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetStringRegion {
-			get {
-				if (_GetStringRegion == null)
-					_GetStringRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetStringRegion;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr _GetStringUTFRegion;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr GetStringUTFRegion {
-			get {
-				if (_GetStringUTFRegion == null)
-					_GetStringUTFRegion = (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_int_int_IntPtr));
-				return _GetStringUTFRegion;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr _GetPrimitiveArrayCritical;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr GetPrimitiveArrayCritical {
-			get {
-				if (_GetPrimitiveArrayCritical == null)
-					_GetPrimitiveArrayCritical = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_IntPtr));
-				return _GetPrimitiveArrayCritical;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int _ReleasePrimitiveArrayCritical;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int ReleasePrimitiveArrayCritical {
-			get {
-				if (_ReleasePrimitiveArrayCritical == null)
-					_ReleasePrimitiveArrayCritical = (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_IntPtr_int));
-				return _ReleasePrimitiveArrayCritical;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string _GetStringCritical;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string GetStringCritical {
-			get {
-				if (_GetStringCritical == null)
-					_GetStringCritical = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr_string));
-				return _GetStringCritical;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr_string _ReleaseStringCritical;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr_string ReleaseStringCritical {
-			get {
-				if (_ReleaseStringCritical == null)
-					_ReleaseStringCritical = (JniAction_JniEnvironmentSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr_string));
-				return _ReleaseStringCritical;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject _NewWeakGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject NewWeakGlobalRef {
-			get {
-				if (_NewWeakGlobalRef == null)
-					_NewWeakGlobalRef = (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_jobject));
-				return _NewWeakGlobalRef;
-			}
-		}
-
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteWeakGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteWeakGlobalRef {
-			get {
-				if (_DeleteWeakGlobalRef == null)
-					_DeleteWeakGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
-				return _DeleteWeakGlobalRef;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_bool _ExceptionCheck;
-		public JniFunc_JniEnvironmentSafeHandle_bool ExceptionCheck {
-			get {
-				if (_ExceptionCheck == null)
-					_ExceptionCheck = (JniFunc_JniEnvironmentSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JniEnvironmentSafeHandle_bool));
-				return _ExceptionCheck;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject _NewDirectByteBuffer;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject NewDirectByteBuffer {
-			get {
-				if (_NewDirectByteBuffer == null)
-					_NewDirectByteBuffer = (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject));
-				return _NewDirectByteBuffer;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr _GetDirectBufferAddress;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr GetDirectBufferAddress {
-			get {
-				if (_GetDirectBufferAddress == null)
-					_GetDirectBufferAddress = (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_IntPtr));
-				return _GetDirectBufferAddress;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_long _GetDirectBufferCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_long GetDirectBufferCapacity {
-			get {
-				if (_GetDirectBufferCapacity == null)
-					_GetDirectBufferCapacity = (JniFunc_JniEnvironmentSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_long));
-				return _GetDirectBufferCapacity;
-			}
-		}
-
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_JniObjectReferenceType _GetObjectRefType;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_JniObjectReferenceType GetObjectRefType {
-			get {
-				if (_GetObjectRefType == null)
-					_GetObjectRefType = (JniFunc_JniEnvironmentSafeHandle_IntPtr_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_JniObjectReferenceType));
-				return _GetObjectRefType;
-			}
-		}
-	}
-}
-#endif // FEATURE_HANDLES_ARE_INTPTRS
diff --git a/tests/invocation-overhead/jni.cs b/tests/invocation-overhead/jni.cs
index d6961cdda..ea710e571 100644
--- a/tests/invocation-overhead/jni.cs
+++ b/tests/invocation-overhead/jni.cs
@@ -2,13 +2,19 @@
 //
 // To make changes, edit monodroid/tools/jnienv-gen-interop and rerun
 
-#if !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS
+#if !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS && !FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX && !FEATURE_HANDLES_ARE_XA_INTPTRS
 #define FEATURE_HANDLES_ARE_SAFE_HANDLES
-#endif  // !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS
+#endif  // !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS && !FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX && !FEATURE_HANDLES_ARE_XA_INTPTRS
 
 #if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS
 #define _NAMESPACE_PER_HANDLE
 #endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS
+#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX
+#define _NAMESPACE_PER_HANDLE
+#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX
+#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_XA_INTPTRS
+#define _NAMESPACE_PER_HANDLE
+#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_XA_INTPTRS
 
 using System;
 using System.Linq;
@@ -17,8 +23,9 @@
 
 using Java.Interop;
 
-#if FEATURE_HANDLES_ARE_INTPTRS
-	using JNIEnvPtr          = System.IntPtr;
+using JNIEnvPtr          = System.IntPtr;
+
+#if FEATURE_HANDLES_ARE_INTPTRS || FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX
 	using jinstanceFieldID   = System.IntPtr;
 	using jstaticFieldID     = System.IntPtr;
 	using jinstanceMethodID  = System.IntPtr;
@@ -72,9 +79,9 @@ partial struct JniNativeInterfaceStruct {
 		public  IntPtr  CallBooleanMethod;              // jboolean    (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...);
 		public  IntPtr  CallBooleanMethodV;             // jboolean    (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list);
 		public  IntPtr  CallBooleanMethodA;             // jboolean    (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
-		public  IntPtr  CallSByteMethod;                // jbyte       (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...);
-		public  IntPtr  CallSByteMethodV;               // jbyte       (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list);
-		public  IntPtr  CallSByteMethodA;               // jbyte       (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
+		public  IntPtr  CallByteMethod;                 // jbyte       (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...);
+		public  IntPtr  CallByteMethodV;                // jbyte       (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list);
+		public  IntPtr  CallByteMethodA;                // jbyte       (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
 		public  IntPtr  CallCharMethod;                 // jchar       (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...);
 		public  IntPtr  CallCharMethodV;                // jchar       (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list);
 		public  IntPtr  CallCharMethodA;                // jchar       (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);
@@ -102,9 +109,9 @@ partial struct JniNativeInterfaceStruct {
 		public  IntPtr  CallNonvirtualBooleanMethod;    // jboolean    (*CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
 		public  IntPtr  CallNonvirtualBooleanMethodV;   // jboolean    (*CallNonvirtualBooleanMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
 		public  IntPtr  CallNonvirtualBooleanMethodA;   // jboolean    (*CallNonvirtualBooleanMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallNonvirtualSByteMethod;      // jbyte       (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
-		public  IntPtr  CallNonvirtualSByteMethodV;     // jbyte       (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
-		public  IntPtr  CallNonvirtualSByteMethodA;     // jbyte       (*CallNonvirtualSByteMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
+		public  IntPtr  CallNonvirtualByteMethod;       // jbyte       (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
+		public  IntPtr  CallNonvirtualByteMethodV;      // jbyte       (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
+		public  IntPtr  CallNonvirtualByteMethodA;      // jbyte       (*CallNonvirtualByteMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
 		public  IntPtr  CallNonvirtualCharMethod;       // jchar       (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);
 		public  IntPtr  CallNonvirtualCharMethodV;      // jchar       (*CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);
 		public  IntPtr  CallNonvirtualCharMethodA;      // jchar       (*CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);
@@ -152,9 +159,9 @@ partial struct JniNativeInterfaceStruct {
 		public  IntPtr  CallStaticBooleanMethod;        // jboolean    (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...);
 		public  IntPtr  CallStaticBooleanMethodV;       // jboolean    (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, va_list);
 		public  IntPtr  CallStaticBooleanMethodA;       // jboolean    (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
-		public  IntPtr  CallStaticSByteMethod;          // jbyte       (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...);
-		public  IntPtr  CallStaticSByteMethodV;         // jbyte       (*CallStaticSByteMethodV)(JNIEnv*, jclass, jmethodID, va_list);
-		public  IntPtr  CallStaticSByteMethodA;         // jbyte       (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
+		public  IntPtr  CallStaticByteMethod;           // jbyte       (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...);
+		public  IntPtr  CallStaticByteMethodV;          // jbyte       (*CallStaticByteMethodV)(JNIEnv*, jclass, jmethodID, va_list);
+		public  IntPtr  CallStaticByteMethodA;          // jbyte       (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
 		public  IntPtr  CallStaticCharMethod;           // jchar       (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...);
 		public  IntPtr  CallStaticCharMethodV;          // jchar       (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list);
 		public  IntPtr  CallStaticCharMethodA;          // jchar       (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);
@@ -278,263 +285,208 @@ partial struct JniNativeInterfaceStruct {
 #endif
 {
 
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int (JniEnvironmentSafeHandle env);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference (JniEnvironmentSafeHandle env, string name, JniReferenceSafeHandle loader, IntPtr buf, int bufLen);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference (JniEnvironmentSafeHandle env, string classname);
-	unsafe delegate JniInstanceMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle method);
-	unsafe delegate JniInstanceFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle field);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle cls, JniInstanceMethodID jmethod, bool isStatic);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle clazz1, JniReferenceSafeHandle clazz2);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle cls, JniInstanceFieldID jfieldID, bool isStatic);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle obj);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle clazz, string message);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle (JniEnvironmentSafeHandle env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_string (JniEnvironmentSafeHandle env, string msg);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int_int (JniEnvironmentSafeHandle env, int capacity);
-	unsafe delegate JniGlobalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr (JniEnvironmentSafeHandle env, IntPtr jobject);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniInstanceMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle kls, string name, string signature);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms);
-	unsafe delegate JniInstanceFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, JniReferenceSafeHandle val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, double val);
-	unsafe delegate JniStaticMethodID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms);
-	unsafe delegate JniStaticFieldID JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, string name, string sig);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, JniReferenceSafeHandle val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, double val);
+	unsafe delegate int JniFunc_JNIEnvPtr_int (JNIEnvPtr env);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference (JNIEnvPtr env, string name, JniReferenceSafeHandle loader, IntPtr buffer, int bufferLength);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_string_JniLocalReference (JNIEnvPtr env, string classname);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle method);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle klass, IntPtr method, bool isStatic);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle klass);
+	unsafe delegate bool JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool (JNIEnvPtr env, JniReferenceSafeHandle class1, JniReferenceSafeHandle class2);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int (JNIEnvPtr env, JniReferenceSafeHandle toThrow);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_int (JNIEnvPtr env, JniReferenceSafeHandle klass, string message);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniLocalReference (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr_string (JNIEnvPtr env, string message);
+	unsafe delegate int JniFunc_JNIEnvPtr_int_int (JNIEnvPtr env, int capacity);
+	unsafe delegate JniGlobalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniGlobalReference (JNIEnvPtr env, JniReferenceSafeHandle @object);
+	unsafe delegate void JniAction_JNIEnvPtr_IntPtr (JNIEnvPtr env, IntPtr @object);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle klass, string name, string signature);
+	unsafe delegate bool JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr method, JValue* args);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate bool JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_bool (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_bool (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_sbyte (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_char (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_char (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_short (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_short (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_int (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_int (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_long (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_long (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_float (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_float (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_double (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_double (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef (JNIEnvPtr env, JniReferenceSafeHandle @object, JniReferenceSafeHandle klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, JniReferenceSafeHandle value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, bool value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, sbyte value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, char value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, short value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, int value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, long value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, float value);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double (JNIEnvPtr env, JniReferenceSafeHandle @object, IntPtr field, double value);
 	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference (JniEnvironmentSafeHandle env, IntPtr unicodeChars, int len);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr chars);
-	unsafe delegate string JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string (JniEnvironmentSafeHandle env, JniReferenceSafeHandle @string, string utf);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference (JniEnvironmentSafeHandle env, int length, JniReferenceSafeHandle elementClass, JniReferenceSafeHandle initialElement);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int index);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int index, JniReferenceSafeHandle value);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference (JniEnvironmentSafeHandle env, int length);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, IntPtr elems, int mode);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle array, int start, int len, IntPtr buf);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jclass, JniNativeMethodRegistration [] methods, int nMethods);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int (JniEnvironmentSafeHandle env, out JavaVMSafeHandle vm);
-	unsafe delegate JniWeakGlobalReference JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_bool (JniEnvironmentSafeHandle env);
-	unsafe delegate JniLocalReference JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference (JniEnvironmentSafeHandle env, IntPtr address, long capacity);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr (JniEnvironmentSafeHandle env, JniReferenceSafeHandle buf);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long (JniEnvironmentSafeHandle env, JniReferenceSafeHandle buf);
-	unsafe delegate JniObjectReferenceType JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType (JniEnvironmentSafeHandle env, JniReferenceSafeHandle jobject);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_IntPtr_int_JniLocalReference (JNIEnvPtr env, IntPtr unicodeChars, int length);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle @string, IntPtr isCopy);
+	unsafe delegate string JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string (JNIEnvPtr env, JniReferenceSafeHandle @string, IntPtr isCopy);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_string (JNIEnvPtr env, JniReferenceSafeHandle @string, string utf);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference (JNIEnvPtr env, int length, JniReferenceSafeHandle elementClass, JniReferenceSafeHandle initialElement);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int_JniLocalReference (JNIEnvPtr env, JniReferenceSafeHandle array, int index);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_JniReferenceSafeHandle (JNIEnvPtr env, JniReferenceSafeHandle array, int index, JniReferenceSafeHandle value);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_int_JniLocalReference (JNIEnvPtr env, int length);
+	unsafe delegate void JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr (JNIEnvPtr env, JniReferenceSafeHandle array, int start, int length, IntPtr buffer);
+	unsafe delegate int JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, JniReferenceSafeHandle klass, JniNativeMethodRegistration [] methods, int numMethods);
+	unsafe delegate int JniFunc_JNIEnvPtr_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
+	unsafe delegate JniWeakGlobalReference JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniWeakGlobalReference (JNIEnvPtr env, JniReferenceSafeHandle @object);
+	unsafe delegate bool JniFunc_JNIEnvPtr_bool (JNIEnvPtr env);
+	unsafe delegate JniLocalReference JniFunc_JNIEnvPtr_IntPtr_long_JniLocalReference (JNIEnvPtr env, IntPtr address, long capacity);
+	unsafe delegate long JniFunc_JNIEnvPtr_JniReferenceSafeHandle_long (JNIEnvPtr env, JniReferenceSafeHandle buffer);
+	unsafe delegate JniObjectReferenceType JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniObjectReferenceType (JNIEnvPtr env, JniReferenceSafeHandle @object);
 
 	partial class JniEnvironment {
 
 	internal static partial class Activator {
 
-		public static unsafe JniLocalReference AllocObject (JniReferenceSafeHandle jclass)
+		public static unsafe JniObjectReference AllocObject (JniObjectReference klass)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 
-			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.SafeHandle, jclass);
+			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewObject (JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewObject (JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 	}
 
 	public static partial class Arrays {
 
-		public static unsafe int GetArrayLength (JniReferenceSafeHandle array_ptr)
+		public static unsafe int GetArrayLength (JniObjectReference array_ptr)
 		{
-			if (array_ptr == null)
+			if (array_ptr.SafeHandle == null)
 				throw new ArgumentNullException ("array_ptr");
-			if (array_ptr.IsInvalid)
+			if (array_ptr.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array_ptr");
 
-			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.SafeHandle, array_ptr);
+			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.EnvironmentPointer, array_ptr.SafeHandle);
 			return tmp;
 		}
 
-		public static unsafe JniLocalReference NewObjectArray (int length, JniReferenceSafeHandle elementClass, JniReferenceSafeHandle initialElement)
+		public static unsafe JniObjectReference NewObjectArray (int length, JniObjectReference elementClass, JniObjectReference initialElement)
 		{
-			if (elementClass == null)
+			if (elementClass.SafeHandle == null)
 				throw new ArgumentNullException ("elementClass");
-			if (elementClass.IsInvalid)
+			if (elementClass.SafeHandle.IsInvalid)
 				throw new ArgumentException ("elementClass");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.SafeHandle, length, elementClass, initialElement);
+			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.EnvironmentPointer, length, elementClass.SafeHandle, initialElement.SafeHandle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference GetObjectArrayElement (JniReferenceSafeHandle array, int index)
+		public static unsafe JniObjectReference GetObjectArrayElement (JniObjectReference array, int index)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index);
+			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, index);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe void SetObjectArrayElement (JniReferenceSafeHandle array, int index, JniReferenceSafeHandle value)
+		public static unsafe void SetObjectArrayElement (JniObjectReference array, int index, JniObjectReference value)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.SafeHandle, array, index, value);
+			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, index, value.SafeHandle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -542,256 +494,256 @@ public static unsafe void SetObjectArrayElement (JniReferenceSafeHandle array, i
 
 		}
 
-		public static unsafe JniLocalReference NewBooleanArray (int length)
+		public static unsafe JniObjectReference NewBooleanArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewByteArray (int length)
+		public static unsafe JniObjectReference NewByteArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewCharArray (int length)
+		public static unsafe JniObjectReference NewCharArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewShortArray (int length)
+		public static unsafe JniObjectReference NewShortArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewIntArray (int length)
+		public static unsafe JniObjectReference NewIntArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewLongArray (int length)
+		public static unsafe JniObjectReference NewLongArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewFloatArray (int length)
+		public static unsafe JniObjectReference NewFloatArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference NewDoubleArray (int length)
+		public static unsafe JniObjectReference NewDoubleArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe IntPtr GetBooleanArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetBooleanArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetByteArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetByteArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetCharArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetCharArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetShortArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetShortArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetIntArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetIntArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetLongArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetLongArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetFloatArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetFloatArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe IntPtr GetDoubleArrayElements (JniReferenceSafeHandle array, IntPtr isCopy)
+		public static unsafe IntPtr GetDoubleArrayElements (JniObjectReference array, IntPtr isCopy)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe void ReleaseBooleanArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseBooleanArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseByteArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseByteArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseCharArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseCharArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseShortArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseShortArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseIntArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseIntArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseLongArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseLongArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseFloatArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseFloatArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		public static unsafe void ReleaseDoubleArrayElements (JniReferenceSafeHandle array, IntPtr elems, int mode)
+		public static unsafe void ReleaseDoubleArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.SafeHandle, array, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, elements, mode);
 		}
 
-		internal static unsafe void GetBooleanArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		internal static unsafe void GetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -799,16 +751,16 @@ internal static unsafe void GetBooleanArrayRegion (JniReferenceSafeHandle array,
 
 		}
 
-		public static unsafe void GetByteArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -816,16 +768,16 @@ public static unsafe void GetByteArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void GetCharArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -833,16 +785,16 @@ public static unsafe void GetCharArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void GetShortArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -850,16 +802,16 @@ public static unsafe void GetShortArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void GetIntArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -867,16 +819,16 @@ public static unsafe void GetIntArrayRegion (JniReferenceSafeHandle array, int s
 
 		}
 
-		public static unsafe void GetLongArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -884,16 +836,16 @@ public static unsafe void GetLongArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void GetFloatArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -901,16 +853,16 @@ public static unsafe void GetFloatArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void GetDoubleArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void GetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -918,16 +870,16 @@ public static unsafe void GetDoubleArrayRegion (JniReferenceSafeHandle array, in
 
 		}
 
-		internal static unsafe void SetBooleanArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		internal static unsafe void SetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -935,16 +887,16 @@ internal static unsafe void SetBooleanArrayRegion (JniReferenceSafeHandle array,
 
 		}
 
-		public static unsafe void SetByteArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -952,16 +904,16 @@ public static unsafe void SetByteArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void SetCharArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -969,16 +921,16 @@ public static unsafe void SetCharArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void SetShortArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -986,16 +938,16 @@ public static unsafe void SetShortArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void SetIntArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1003,16 +955,16 @@ public static unsafe void SetIntArrayRegion (JniReferenceSafeHandle array, int s
 
 		}
 
-		public static unsafe void SetLongArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1020,16 +972,16 @@ public static unsafe void SetLongArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void SetFloatArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1037,16 +989,16 @@ public static unsafe void SetFloatArrayRegion (JniReferenceSafeHandle array, int
 
 		}
 
-		public static unsafe void SetDoubleArrayRegion (JniReferenceSafeHandle array, int start, int len, IntPtr buf)
+		public static unsafe void SetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
-			if (array == null)
+			if (array.SafeHandle == null)
 				throw new ArgumentNullException ("array");
-			if (array.IsInvalid)
+			if (array.SafeHandle.IsInvalid)
 				throw new ArgumentException ("array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array, start, len, buf);
+			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.SafeHandle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1055,283 +1007,428 @@ public static unsafe void SetDoubleArrayRegion (JniReferenceSafeHandle array, in
 		}
 	}
 
-	public static partial class Errors {
+	public static partial class Exceptions {
 
-		public static unsafe int Throw (JniReferenceSafeHandle obj)
+		public static unsafe int Throw (JniObjectReference toThrow)
 		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
+			if (toThrow.SafeHandle == null)
+				throw new ArgumentNullException ("toThrow");
+			if (toThrow.SafeHandle.IsInvalid)
+				throw new ArgumentException ("toThrow");
 
-			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.SafeHandle, obj);
+			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.EnvironmentPointer, toThrow.SafeHandle);
 			return tmp;
 		}
 
-		public static unsafe int ThrowNew (JniReferenceSafeHandle clazz, string message)
+		public static unsafe int ThrowNew (JniObjectReference klass, string message)
 		{
-			if (clazz == null)
-				throw new ArgumentNullException ("clazz");
-			if (clazz.IsInvalid)
-				throw new ArgumentException ("clazz");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 			if (message == null)
 				throw new ArgumentNullException ("message");
 
-			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.SafeHandle, clazz, message);
+			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, message);
 			return tmp;
 		}
 
-		internal static unsafe JniLocalReference ExceptionOccurred ()
+		internal static unsafe JniObjectReference ExceptionOccurred ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.SafeHandle);
-			return tmp;
+			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.EnvironmentPointer);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		internal static unsafe void ExceptionDescribe ()
 		{
-			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.SafeHandle);
+			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.EnvironmentPointer);
 		}
 
 		internal static unsafe void ExceptionClear ()
 		{
-			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.SafeHandle);
+			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.EnvironmentPointer);
 		}
 
-		public static unsafe void FatalError (string msg)
+		public static unsafe void FatalError (string message)
 		{
-			if (msg == null)
-				throw new ArgumentNullException ("msg");
+			if (message == null)
+				throw new ArgumentNullException ("message");
 
-			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.SafeHandle, msg);
+			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.EnvironmentPointer, message);
 		}
 
 		internal static unsafe bool ExceptionCheck ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.SafeHandle);
+			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.EnvironmentPointer);
 			return tmp;
 		}
 	}
 
-	public static partial class Handles {
+	internal static partial class InstanceFields {
 
-		public static unsafe int PushLocalFrame (int capacity)
+		public static unsafe JniInstanceFieldInfo GetFieldID (JniObjectReference klass, string name, string signature)
 		{
-			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceFieldInfo (tmp);
 		}
 
-		public static unsafe JniLocalReference PopLocalFrame (JniReferenceSafeHandle result)
+		internal static unsafe JniObjectReference GetObjectField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.SafeHandle, result);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniGlobalReference NewGlobalRef (JniReferenceSafeHandle jobject)
+		internal static unsafe bool GetBooleanField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe void DeleteGlobalRef (IntPtr jobject)
+		internal static unsafe sbyte GetByteField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe void DeleteLocalRef (IntPtr jobject)
+		internal static unsafe char GetCharField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe JniLocalReference NewLocalRef (JniReferenceSafeHandle jobject)
+		internal static unsafe short GetShortField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		public static unsafe int EnsureLocalCapacity (int capacity)
+		internal static unsafe int GetIntField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.SafeHandle, capacity);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		public static unsafe int GetJavaVM (out JavaVMSafeHandle vm)
+		internal static unsafe long GetLongField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.SafeHandle, out vm);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe JniWeakGlobalReference NewWeakGlobalRef (JniReferenceSafeHandle jobject)
+		internal static unsafe float GetFloatField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe void DeleteWeakGlobalRef (IntPtr jobject)
+		internal static unsafe double GetDoubleField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe JniObjectReferenceType GetObjectRefType (JniReferenceSafeHandle jobject)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, JniObjectReference value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.SafeHandle, jobject);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value.SafeHandle);
 		}
-	}
 
-	public static partial class IO {
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, bool value)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
+		}
 
-		public static unsafe JniLocalReference NewDirectByteBuffer (IntPtr address, long capacity)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, sbyte value)
 		{
-			if (address == IntPtr.Zero)
-				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.SafeHandle, address, capacity);
+			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, char value)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
 		}
 
-		public static unsafe IntPtr GetDirectBufferAddress (JniReferenceSafeHandle buf)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, short value)
 		{
-			if (buf == null)
-				throw new ArgumentNullException ("buf");
-			if (buf.IsInvalid)
-				throw new ArgumentException ("buf");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
 		}
 
-		public static unsafe long GetDirectBufferCapacity (JniReferenceSafeHandle buf)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, int value)
 		{
-			if (buf == null)
-				throw new ArgumentNullException ("buf");
-			if (buf.IsInvalid)
-				throw new ArgumentException ("buf");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.SafeHandle, buf);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
 		}
-	}
 
-	internal static partial class Members {
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, long value)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
+		}
 
-		internal static unsafe JniLocalReference ToReflectedMethod (JniReferenceSafeHandle cls, JniInstanceMethodID jmethod, bool isStatic)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, float value)
 		{
-			if (cls == null)
-				throw new ArgumentNullException ("cls");
-			if (cls.IsInvalid)
-				throw new ArgumentException ("cls");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.SafeHandle, cls, jmethod, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe JniLocalReference ToReflectedField (JniReferenceSafeHandle cls, JniInstanceFieldID jfieldID, bool isStatic)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, double value)
 		{
-			if (cls == null)
-				throw new ArgumentNullException ("cls");
-			if (cls.IsInvalid)
-				throw new ArgumentException ("cls");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.SafeHandle, cls, jfieldID, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, field.ID, value);
 		}
+	}
 
-		internal static unsafe JniInstanceMethodID GetMethodID (JniReferenceSafeHandle kls, string name, string signature)
+	internal static partial class InstanceMethods {
+
+		internal static unsafe JniInstanceMethodInfo GetMethodID (JniObjectReference klass, string name, string signature)
 		{
-			if (kls == null)
-				throw new ArgumentNullException ("kls");
-			if (kls.IsInvalid)
-				throw new ArgumentException ("kls");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 			if (name == null)
 				throw new ArgumentNullException ("name");
 			if (signature == null)
 				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.SafeHandle, kls, name, signature);
+			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceMethodInfo (tmp);
 		}
 
-		internal static unsafe JniLocalReference CallObjectMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniLocalReference CallObjectMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1340,18 +1437,18 @@ internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, J
 			return tmp;
 		}
 
-		internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1360,18 +1457,18 @@ internal static unsafe bool CallBooleanMethod (JniReferenceSafeHandle jobject, J
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1380,18 +1477,18 @@ internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1400,18 +1497,18 @@ internal static unsafe sbyte CallSByteMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1420,18 +1517,18 @@ internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniI
 			return tmp;
 		}
 
-		internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1440,18 +1537,18 @@ internal static unsafe char CallCharMethod (JniReferenceSafeHandle jobject, JniI
 			return tmp;
 		}
 
-		internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1460,18 +1557,18 @@ internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1480,18 +1577,18 @@ internal static unsafe short CallShortMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1500,18 +1597,18 @@ internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniIns
 			return tmp;
 		}
 
-		internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1520,18 +1617,18 @@ internal static unsafe int CallIntMethod (JniReferenceSafeHandle jobject, JniIns
 			return tmp;
 		}
 
-		internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1540,18 +1637,18 @@ internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniI
 			return tmp;
 		}
 
-		internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1560,18 +1657,18 @@ internal static unsafe long CallLongMethod (JniReferenceSafeHandle jobject, JniI
 			return tmp;
 		}
 
-		internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1580,18 +1677,18 @@ internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1600,18 +1697,18 @@ internal static unsafe float CallFloatMethod (JniReferenceSafeHandle jobject, Jn
 			return tmp;
 		}
 
-		internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1620,18 +1717,18 @@ internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject,
 			return tmp;
 		}
 
-		internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1640,18 +1737,18 @@ internal static unsafe double CallDoubleMethod (JniReferenceSafeHandle jobject,
 			return tmp;
 		}
 
-		internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod)
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jmethod);
+			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1659,18 +1756,18 @@ internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniI
 
 		}
 
-		internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jmethod, parms);
+			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1678,72 +1775,72 @@ internal static unsafe void CallVoidMethod (JniReferenceSafeHandle jobject, JniI
 
 		}
 
-		internal static unsafe JniLocalReference CallNonvirtualObjectMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniLocalReference CallNonvirtualObjectMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1752,22 +1849,22 @@ internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle
 			return tmp;
 		}
 
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1776,22 +1873,22 @@ internal static unsafe bool CallNonvirtualBooleanMethod (JniReferenceSafeHandle
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1800,22 +1897,22 @@ internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1824,22 +1921,22 @@ internal static unsafe sbyte CallNonvirtualSByteMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1848,22 +1945,22 @@ internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle job
 			return tmp;
 		}
 
-		internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1872,22 +1969,22 @@ internal static unsafe char CallNonvirtualCharMethod (JniReferenceSafeHandle job
 			return tmp;
 		}
 
-		internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1896,22 +1993,22 @@ internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1920,22 +2017,22 @@ internal static unsafe short CallNonvirtualShortMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1944,22 +2041,22 @@ internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobje
 			return tmp;
 		}
 
-		internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1968,22 +2065,22 @@ internal static unsafe int CallNonvirtualIntMethod (JniReferenceSafeHandle jobje
 			return tmp;
 		}
 
-		internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -1992,22 +2089,22 @@ internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle job
 			return tmp;
 		}
 
-		internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2016,22 +2113,22 @@ internal static unsafe long CallNonvirtualLongMethod (JniReferenceSafeHandle job
 			return tmp;
 		}
 
-		internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2040,22 +2137,22 @@ internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2064,22 +2161,22 @@ internal static unsafe float CallNonvirtualFloatMethod (JniReferenceSafeHandle j
 			return tmp;
 		}
 
-		internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2088,22 +2185,22 @@ internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle
 			return tmp;
 		}
 
-		internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2112,22 +2209,22 @@ internal static unsafe double CallNonvirtualDoubleMethod (JniReferenceSafeHandle
 			return tmp;
 		}
 
-		internal static unsafe void CallNonvirtualVoidMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod)
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod);
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2135,385 +2232,567 @@ internal static unsafe void CallNonvirtualVoidMethod (JniReferenceSafeHandle job
 
 		}
 
-		internal static unsafe void CallNonvirtualVoidMethod (JniReferenceSafeHandle jobject, JniReferenceSafeHandle jclass, JniInstanceMethodID jmethod, JValue* parms)
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.SafeHandle, jobject, jclass, jmethod, parms);
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 		}
+	}
+
+	public static partial class IO {
 
-		public static unsafe JniInstanceFieldID GetFieldID (JniReferenceSafeHandle jclass, string name, string sig)
+		public static unsafe JniObjectReference NewDirectByteBuffer (IntPtr address, long capacity)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (address == IntPtr.Zero)
+				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
 
-			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.EnvironmentPointer, address, capacity);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe IntPtr GetDirectBufferAddress (JniObjectReference buffer)
+		{
+			if (buffer.SafeHandle == null)
+				throw new ArgumentNullException ("buffer");
+			if (buffer.SafeHandle.IsInvalid)
+				throw new ArgumentException ("buffer");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.EnvironmentPointer, buffer.SafeHandle);
+			return tmp;
+		}
+
+		public static unsafe long GetDirectBufferCapacity (JniObjectReference buffer)
+		{
+			if (buffer.SafeHandle == null)
+				throw new ArgumentNullException ("buffer");
+			if (buffer.SafeHandle.IsInvalid)
+				throw new ArgumentException ("buffer");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.EnvironmentPointer, buffer.SafeHandle);
+			return tmp;
+		}
+	}
+
+	internal static partial class Monitors {
+
+		public static unsafe int MonitorEnter (JniObjectReference @object)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+
+			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
+			return tmp;
+		}
+
+		public static unsafe int MonitorExit (JniObjectReference @object)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+
+			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
 			return tmp;
 		}
+	}
+
+	public static partial class References {
 
-		internal static unsafe JniLocalReference GetObjectField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		public static unsafe int PushLocalFrame (int capacity)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+		public static unsafe JniObjectReference PopLocalFrame (JniObjectReference result)
+		{
+			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.EnvironmentPointer, result.SafeHandle);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		internal static unsafe JniObjectReference NewGlobalRef (JniObjectReference @object)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Global);
+		}
+
+		internal static unsafe void DeleteGlobalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		internal static unsafe void DeleteLocalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		internal static unsafe JniObjectReference NewLocalRef (JniObjectReference @object)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe int EnsureLocalCapacity (int capacity)
+		{
+			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
+
+		public static unsafe int GetJavaVM (out IntPtr vm)
+		{
+			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.EnvironmentPointer, out vm);
+			return tmp;
+		}
+
+		internal static unsafe JniObjectReference NewWeakGlobalRef (JniObjectReference @object)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.WeakGlobal);
+		}
+
+		internal static unsafe void DeleteWeakGlobalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		internal static unsafe JniObjectReferenceType GetObjectRefType (JniObjectReference @object)
+		{
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
 			return tmp;
 		}
+	}
+
+	internal static partial class Reflection {
+
+		internal static unsafe JniObjectReference ToReflectedMethod (JniObjectReference klass, JniInstanceMethodInfo method, bool isStatic)
+		{
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		internal static unsafe JniObjectReference ToReflectedField (JniObjectReference klass, JniInstanceFieldInfo field, bool isStatic)
+		{
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+	}
+
+	internal static partial class StaticFields {
+
+		public static unsafe JniStaticFieldInfo GetStaticFieldID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticFieldInfo (tmp);
+		}
+
+		internal static unsafe JniObjectReference GetStaticObjectField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
 
-		internal static unsafe bool GetBooleanField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe bool GetStaticBooleanField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe sbyte GetByteField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe sbyte GetStaticByteField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe char GetCharField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe char GetStaticCharField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe short GetShortField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe short GetStaticShortField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe int GetIntField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe int GetStaticIntField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe long GetLongField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe long GetStaticLongField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe float GetFloatField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe float GetStaticFloatField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe double GetDoubleField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID)
+		internal static unsafe double GetStaticDoubleField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, JniReferenceSafeHandle val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, JniObjectReference value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value.SafeHandle);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, bool val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, bool value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, sbyte val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, sbyte value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, char val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, char value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, short val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, short value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, int val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, int value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, long val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, long value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, float val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, float value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
 
-		internal static unsafe void SetField (JniReferenceSafeHandle jobject, JniInstanceFieldID jfieldID, double val)
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, double value)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.SafeHandle, jobject, jfieldID, val);
+			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, field.ID, value);
 		}
+	}
+
+	internal static partial class StaticMethods {
 
-		public static unsafe JniStaticMethodID GetStaticMethodID (JniReferenceSafeHandle jclass, string name, string sig)
+		public static unsafe JniStaticMethodInfo GetStaticMethodID (JniObjectReference klass, string name, string signature)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 			if (name == null)
 				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticMethodInfo (tmp);
 		}
 
-		internal static unsafe JniLocalReference CallStaticObjectMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniLocalReference CallStaticObjectMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2522,18 +2801,18 @@ internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jcla
 			return tmp;
 		}
 
-		internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2542,18 +2821,18 @@ internal static unsafe bool CallStaticBooleanMethod (JniReferenceSafeHandle jcla
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2562,18 +2841,18 @@ internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2582,18 +2861,18 @@ internal static unsafe sbyte CallStaticSByteMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2602,18 +2881,18 @@ internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass,
 			return tmp;
 		}
 
-		internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2622,18 +2901,18 @@ internal static unsafe char CallStaticCharMethod (JniReferenceSafeHandle jclass,
 			return tmp;
 		}
 
-		internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2642,18 +2921,18 @@ internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2662,18 +2941,18 @@ internal static unsafe short CallStaticShortMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2682,18 +2961,18 @@ internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, J
 			return tmp;
 		}
 
-		internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2702,18 +2981,18 @@ internal static unsafe int CallStaticIntMethod (JniReferenceSafeHandle jclass, J
 			return tmp;
 		}
 
-		internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2722,18 +3001,18 @@ internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass,
 			return tmp;
 		}
 
-		internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2742,18 +3021,18 @@ internal static unsafe long CallStaticLongMethod (JniReferenceSafeHandle jclass,
 			return tmp;
 		}
 
-		internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2762,18 +3041,18 @@ internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2782,18 +3061,18 @@ internal static unsafe float CallStaticFloatMethod (JniReferenceSafeHandle jclas
 			return tmp;
 		}
 
-		internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2802,18 +3081,18 @@ internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jcl
 			return tmp;
 		}
 
-		internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2822,18 +3101,18 @@ internal static unsafe double CallStaticDoubleMethod (JniReferenceSafeHandle jcl
 			return tmp;
 		}
 
-		internal static unsafe void CallStaticVoidMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod)
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.SafeHandle, jclass, jmethod);
+			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -2841,491 +3120,184 @@ internal static unsafe void CallStaticVoidMethod (JniReferenceSafeHandle jclass,
 
 		}
 
-		internal static unsafe void CallStaticVoidMethod (JniReferenceSafeHandle jclass, JniStaticMethodID jmethod, JValue* parms)
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jmethod == null)
-				throw new ArgumentNullException ("jmethod");
-			if (jmethod.IsInvalid)
-				throw new ArgumentException ("jmethod");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.SafeHandle, jclass, jmethod, parms);
+			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 		}
+	}
+
+	public static partial class Strings {
 
-		public static unsafe JniStaticFieldID GetStaticFieldID (JniReferenceSafeHandle jclass, string name, string sig)
+		internal static unsafe JniObjectReference NewString (IntPtr unicodeChars, int length)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (unicodeChars == IntPtr.Zero)
+				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.SafeHandle, jclass, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.EnvironmentPointer, unicodeChars, length);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniLocalReference GetStaticObjectField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
+		internal static unsafe int GetStringLength (JniObjectReference @string)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (@string.SafeHandle == null)
+				throw new ArgumentNullException ("@string");
+			if (@string.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@string");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.EnvironmentPointer, @string.SafeHandle);
 			return tmp;
 		}
 
-		internal static unsafe bool GetStaticBooleanField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
+		internal static unsafe IntPtr GetStringChars (JniObjectReference @string, IntPtr isCopy)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
+			if (@string.SafeHandle == null)
+				throw new ArgumentNullException ("@string");
+			if (@string.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@string");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.EnvironmentPointer, @string.SafeHandle, isCopy);
 			return tmp;
 		}
 
-		internal static unsafe sbyte GetStaticByteField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
+		internal static unsafe void ReleaseStringChars (JniObjectReference @string, IntPtr chars)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe char GetStaticCharField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe short GetStaticShortField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe int GetStaticIntField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe long GetStaticLongField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe float GetStaticFloatField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe double GetStaticDoubleField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID);
-			return tmp;
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, JniReferenceSafeHandle val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, bool val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, sbyte val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, char val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, short val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, int val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, long val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, float val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-
-		internal static unsafe void SetStaticField (JniReferenceSafeHandle jclass, JniStaticFieldID jfieldID, double val)
-		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
-			if (jfieldID == null)
-				throw new ArgumentNullException ("jfieldID");
-			if (jfieldID.IsInvalid)
-				throw new ArgumentException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass, jfieldID, val);
-		}
-	}
-
-	internal static partial class Monitors {
-
-		public static unsafe int MonitorEnter (JniReferenceSafeHandle obj)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-
-		public static unsafe int MonitorExit (JniReferenceSafeHandle obj)
-		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-
-			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.SafeHandle, obj);
-			return tmp;
-		}
-	}
-
-	public static partial class Strings {
-
-		internal static unsafe JniLocalReference NewString (IntPtr unicodeChars, int len)
-		{
-			if (unicodeChars == IntPtr.Zero)
-				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
-
-			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.SafeHandle, unicodeChars, len);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
-
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
-		}
-
-		internal static unsafe int GetStringLength (JniReferenceSafeHandle @string)
-		{
-			if (@string == null)
-				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
-				throw new ArgumentException ("@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.SafeHandle, @string);
-			return tmp;
-		}
-
-		internal static unsafe IntPtr GetStringChars (JniReferenceSafeHandle @string, IntPtr isCopy)
-		{
-			if (@string == null)
-				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
-				throw new ArgumentException ("@string");
-
-			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.SafeHandle, @string, isCopy);
-			return tmp;
-		}
-
-		internal static unsafe void ReleaseStringChars (JniReferenceSafeHandle @string, IntPtr chars)
-		{
-			if (@string == null)
+			if (@string.SafeHandle == null)
 				throw new ArgumentNullException ("@string");
-			if (@string.IsInvalid)
+			if (@string.SafeHandle.IsInvalid)
 				throw new ArgumentException ("@string");
 			if (chars == IntPtr.Zero)
 				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
 
-			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.SafeHandle, @string, chars);
+			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.EnvironmentPointer, @string.SafeHandle, chars);
 		}
 	}
 
 	public static partial class Types {
 
-		internal static unsafe JniLocalReference DefineClass (string name, JniReferenceSafeHandle loader, IntPtr buf, int bufLen)
+		internal static unsafe JniObjectReference DefineClass (string name, JniObjectReference loader, IntPtr buffer, int bufferLength)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name");
-			if (loader == null)
+			if (loader.SafeHandle == null)
 				throw new ArgumentNullException ("loader");
-			if (loader.IsInvalid)
+			if (loader.SafeHandle.IsInvalid)
 				throw new ArgumentException ("loader");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.SafeHandle, name, loader, buf, bufLen);
+			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.EnvironmentPointer, name, loader.SafeHandle, buffer, bufferLength);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference FindClass (string classname)
+		public static unsafe JniObjectReference FindClass (string classname)
 		{
 			if (classname == null)
 				throw new ArgumentNullException ("classname");
 
-			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.SafeHandle, classname);
+			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.EnvironmentPointer, classname);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniLocalReference GetSuperclass (JniReferenceSafeHandle jclass)
+		public static unsafe JniObjectReference GetSuperclass (JniObjectReference klass)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 
-			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.SafeHandle, jclass);
+			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe bool IsAssignableFrom (JniReferenceSafeHandle clazz1, JniReferenceSafeHandle clazz2)
+		public static unsafe bool IsAssignableFrom (JniObjectReference class1, JniObjectReference class2)
 		{
-			if (clazz1 == null)
-				throw new ArgumentNullException ("clazz1");
-			if (clazz1.IsInvalid)
-				throw new ArgumentException ("clazz1");
-			if (clazz2 == null)
-				throw new ArgumentNullException ("clazz2");
-			if (clazz2.IsInvalid)
-				throw new ArgumentException ("clazz2");
+			if (class1.SafeHandle == null)
+				throw new ArgumentNullException ("class1");
+			if (class1.SafeHandle.IsInvalid)
+				throw new ArgumentException ("class1");
+			if (class2.SafeHandle == null)
+				throw new ArgumentNullException ("class2");
+			if (class2.SafeHandle.IsInvalid)
+				throw new ArgumentException ("class2");
 
-			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.SafeHandle, clazz1, clazz2);
+			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.EnvironmentPointer, class1.SafeHandle, class2.SafeHandle);
 			return tmp;
 		}
 
-		public static unsafe bool IsSameObject (JniReferenceSafeHandle ref1, JniReferenceSafeHandle ref2)
+		public static unsafe bool IsSameObject (JniObjectReference object1, JniObjectReference object2)
 		{
-			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.SafeHandle, ref1, ref2);
+			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.EnvironmentPointer, object1.SafeHandle, object2.SafeHandle);
 			return tmp;
 		}
 
-		public static unsafe JniLocalReference GetObjectClass (JniReferenceSafeHandle jobject)
+		public static unsafe JniObjectReference GetObjectClass (JniObjectReference @object)
 		{
-			if (jobject == null)
-				throw new ArgumentNullException ("jobject");
-			if (jobject.IsInvalid)
-				throw new ArgumentException ("jobject");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.SafeHandle, jobject);
+			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return tmp;
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe bool IsInstanceOf (JniReferenceSafeHandle obj, JniReferenceSafeHandle clazz)
+		public static unsafe bool IsInstanceOf (JniObjectReference @object, JniObjectReference klass)
 		{
-			if (obj == null)
-				throw new ArgumentNullException ("obj");
-			if (obj.IsInvalid)
-				throw new ArgumentException ("obj");
-			if (clazz == null)
-				throw new ArgumentNullException ("clazz");
-			if (clazz.IsInvalid)
-				throw new ArgumentException ("clazz");
+			if (@object.SafeHandle == null)
+				throw new ArgumentNullException ("@object");
+			if (@object.SafeHandle.IsInvalid)
+				throw new ArgumentException ("@object");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 
-			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.SafeHandle, obj, clazz);
+			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.EnvironmentPointer, @object.SafeHandle, klass.SafeHandle);
 			return tmp;
 		}
 
-		internal static unsafe int RegisterNatives (JniReferenceSafeHandle jclass, JniNativeMethodRegistration [] methods, int nMethods)
+		internal static unsafe int RegisterNatives (JniObjectReference klass, JniNativeMethodRegistration [] methods, int numMethods)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 
-			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.SafeHandle, jclass, methods, nMethods);
+			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle, methods, numMethods);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -3334,14 +3306,14 @@ internal static unsafe int RegisterNatives (JniReferenceSafeHandle jclass, JniNa
 			return tmp;
 		}
 
-		internal static unsafe int UnregisterNatives (JniReferenceSafeHandle jclass)
+		internal static unsafe int UnregisterNatives (JniObjectReference klass)
 		{
-			if (jclass == null)
-				throw new ArgumentNullException ("jclass");
-			if (jclass.IsInvalid)
-				throw new ArgumentException ("jclass");
+			if (klass.SafeHandle == null)
+				throw new ArgumentNullException ("klass");
+			if (klass.SafeHandle.IsInvalid)
+				throw new ArgumentException ("klass");
 
-			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.SafeHandle, jclass);
+			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.EnvironmentPointer, klass.SafeHandle);
 			return tmp;
 		}
 	}
@@ -3350,7 +3322,7 @@ internal static partial class Versions {
 
 		internal static unsafe int GetVersion ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.SafeHandle);
+			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.EnvironmentPointer);
 			return tmp;
 		}
 	}
@@ -3366,1784 +3338,1784 @@ public unsafe JniEnvironmentInvoker (JniNativeInterfaceStruct* p)
 		}
 
 
-		JniFunc_JniEnvironmentSafeHandle_int _GetVersion;
-		public JniFunc_JniEnvironmentSafeHandle_int GetVersion {
+		JniFunc_JNIEnvPtr_int _GetVersion;
+		public JniFunc_JNIEnvPtr_int GetVersion {
 			get {
 				if (_GetVersion == null)
-					_GetVersion = (JniFunc_JniEnvironmentSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JniEnvironmentSafeHandle_int));
+					_GetVersion = (JniFunc_JNIEnvPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JNIEnvPtr_int));
 				return _GetVersion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference _DefineClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference DefineClass {
+		JniFunc_JNIEnvPtr_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference _DefineClass;
+		public JniFunc_JNIEnvPtr_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference DefineClass {
 			get {
 				if (_DefineClass == null)
-					_DefineClass = (JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference));
+					_DefineClass = (JniFunc_JNIEnvPtr_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JNIEnvPtr_string_JniReferenceSafeHandle_IntPtr_int_JniLocalReference));
 				return _DefineClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference _FindClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference FindClass {
+		JniFunc_JNIEnvPtr_string_JniLocalReference _FindClass;
+		public JniFunc_JNIEnvPtr_string_JniLocalReference FindClass {
 			get {
 				if (_FindClass == null)
-					_FindClass = (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference));
+					_FindClass = (JniFunc_JNIEnvPtr_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JNIEnvPtr_string_JniLocalReference));
 				return _FindClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _FromReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID FromReflectedMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _FromReflectedMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr FromReflectedMethod {
 			get {
 				if (_FromReflectedMethod == null)
-					_FromReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
+					_FromReflectedMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _FromReflectedMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID _FromReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID FromReflectedField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _FromReflectedField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr FromReflectedField {
 			get {
 				if (_FromReflectedField == null)
-					_FromReflectedField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID));
+					_FromReflectedField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _FromReflectedField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference _ToReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference ToReflectedMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference _ToReflectedMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference ToReflectedMethod {
 			get {
 				if (_ToReflectedMethod == null)
-					_ToReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool_JniLocalReference));
+					_ToReflectedMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference));
 				return _ToReflectedMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _GetSuperclass;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference GetSuperclass {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference _GetSuperclass;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference GetSuperclass {
 			get {
 				if (_GetSuperclass == null)
-					_GetSuperclass = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_GetSuperclass = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference));
 				return _GetSuperclass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsAssignableFrom;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsAssignableFrom {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsAssignableFrom;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsAssignableFrom {
 			get {
 				if (_IsAssignableFrom == null)
-					_IsAssignableFrom = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
+					_IsAssignableFrom = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
 				return _IsAssignableFrom;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference _ToReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference ToReflectedField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference _ToReflectedField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference ToReflectedField {
 			get {
 				if (_ToReflectedField == null)
-					_ToReflectedField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool_JniLocalReference));
+					_ToReflectedField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool_JniLocalReference));
 				return _ToReflectedField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _Throw;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int Throw {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _Throw;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int Throw {
 			get {
 				if (_Throw == null)
-					_Throw = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_Throw = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _Throw;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int _ThrowNew;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int ThrowNew {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_int _ThrowNew;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_int ThrowNew {
 			get {
 				if (_ThrowNew == null)
-					_ThrowNew = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_int));
+					_ThrowNew = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_int));
 				return _ThrowNew;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniLocalReference _ExceptionOccurred;
-		public JniFunc_JniEnvironmentSafeHandle_JniLocalReference ExceptionOccurred {
+		JniFunc_JNIEnvPtr_JniLocalReference _ExceptionOccurred;
+		public JniFunc_JNIEnvPtr_JniLocalReference ExceptionOccurred {
 			get {
 				if (_ExceptionOccurred == null)
-					_ExceptionOccurred = (JniFunc_JniEnvironmentSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JniEnvironmentSafeHandle_JniLocalReference));
+					_ExceptionOccurred = (JniFunc_JNIEnvPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JNIEnvPtr_JniLocalReference));
 				return _ExceptionOccurred;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle _ExceptionDescribe;
-		public JniAction_JniEnvironmentSafeHandle ExceptionDescribe {
+		JniAction_JNIEnvPtr _ExceptionDescribe;
+		public JniAction_JNIEnvPtr ExceptionDescribe {
 			get {
 				if (_ExceptionDescribe == null)
-					_ExceptionDescribe = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JniEnvironmentSafeHandle));
+					_ExceptionDescribe = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JNIEnvPtr));
 				return _ExceptionDescribe;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle _ExceptionClear;
-		public JniAction_JniEnvironmentSafeHandle ExceptionClear {
+		JniAction_JNIEnvPtr _ExceptionClear;
+		public JniAction_JNIEnvPtr ExceptionClear {
 			get {
 				if (_ExceptionClear == null)
-					_ExceptionClear = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JniEnvironmentSafeHandle));
+					_ExceptionClear = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JNIEnvPtr));
 				return _ExceptionClear;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_string _FatalError;
-		public JniAction_JniEnvironmentSafeHandle_string FatalError {
+		JniAction_JNIEnvPtr_string _FatalError;
+		public JniAction_JNIEnvPtr_string FatalError {
 			get {
 				if (_FatalError == null)
-					_FatalError = (JniAction_JniEnvironmentSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JniEnvironmentSafeHandle_string));
+					_FatalError = (JniAction_JNIEnvPtr_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JNIEnvPtr_string));
 				return _FatalError;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_int _PushLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_int_int PushLocalFrame {
+		JniFunc_JNIEnvPtr_int_int _PushLocalFrame;
+		public JniFunc_JNIEnvPtr_int_int PushLocalFrame {
 			get {
 				if (_PushLocalFrame == null)
-					_PushLocalFrame = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
+					_PushLocalFrame = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JNIEnvPtr_int_int));
 				return _PushLocalFrame;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _PopLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference PopLocalFrame {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference _PopLocalFrame;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference PopLocalFrame {
 			get {
 				if (_PopLocalFrame == null)
-					_PopLocalFrame = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_PopLocalFrame = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference));
 				return _PopLocalFrame;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference _NewGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference NewGlobalRef {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniGlobalReference _NewGlobalRef;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniGlobalReference NewGlobalRef {
 			get {
 				if (_NewGlobalRef == null)
-					_NewGlobalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniGlobalReference));
+					_NewGlobalRef = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniGlobalReference));
 				return _NewGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteGlobalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteGlobalRef {
 			get {
 				if (_DeleteGlobalRef == null)
-					_DeleteGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteLocalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteLocalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteLocalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteLocalRef {
 			get {
 				if (_DeleteLocalRef == null)
-					_DeleteLocalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteLocalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteLocalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsSameObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsSameObject {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsSameObject;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsSameObject {
 			get {
 				if (_IsSameObject == null)
-					_IsSameObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
+					_IsSameObject = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
 				return _IsSameObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _NewLocalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference NewLocalRef {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference _NewLocalRef;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference NewLocalRef {
 			get {
 				if (_NewLocalRef == null)
-					_NewLocalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_NewLocalRef = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference));
 				return _NewLocalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_int _EnsureLocalCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_int_int EnsureLocalCapacity {
+		JniFunc_JNIEnvPtr_int_int _EnsureLocalCapacity;
+		public JniFunc_JNIEnvPtr_int_int EnsureLocalCapacity {
 			get {
 				if (_EnsureLocalCapacity == null)
-					_EnsureLocalCapacity = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
+					_EnsureLocalCapacity = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JNIEnvPtr_int_int));
 				return _EnsureLocalCapacity;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _AllocObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference AllocObject {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference _AllocObject;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference AllocObject {
 			get {
 				if (_AllocObject == null)
-					_AllocObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_AllocObject = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference));
 				return _AllocObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _NewObject;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference NewObject {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference _NewObject;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference NewObject {
 			get {
 				if (_NewObject == null)
-					_NewObject = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
+					_NewObject = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _NewObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _NewObjectA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference NewObjectA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference _NewObjectA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference NewObjectA {
 			get {
 				if (_NewObjectA == null)
-					_NewObjectA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
+					_NewObjectA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference));
 				return _NewObjectA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference _GetObjectClass;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference GetObjectClass {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference _GetObjectClass;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference GetObjectClass {
 			get {
 				if (_GetObjectClass == null)
-					_GetObjectClass = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_GetObjectClass = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniLocalReference));
 				return _GetObjectClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsInstanceOf;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsInstanceOf {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool _IsInstanceOf;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool IsInstanceOf {
 			get {
 				if (_IsInstanceOf == null)
-					_IsInstanceOf = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
+					_IsInstanceOf = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_bool));
 				return _IsInstanceOf;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID _GetMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID GetMethodID {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr _GetMethodID;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr GetMethodID {
 			get {
 				if (_GetMethodID == null)
-					_GetMethodID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceMethodID));
+					_GetMethodID = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr));
 				return _GetMethodID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _CallObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference CallObjectMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference _CallObjectMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference CallObjectMethod {
 			get {
 				if (_CallObjectMethod == null)
-					_CallObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
+					_CallObjectMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _CallObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _CallObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference CallObjectMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference _CallObjectMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference CallObjectMethodA {
 			get {
 				if (_CallObjectMethodA == null)
-					_CallObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
+					_CallObjectMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference));
 				return _CallObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool _CallBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool CallBooleanMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _CallBooleanMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool CallBooleanMethod {
 			get {
 				if (_CallBooleanMethod == null)
-					_CallBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool));
+					_CallBooleanMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _CallBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool _CallBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool CallBooleanMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool _CallBooleanMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool CallBooleanMethodA {
 			get {
 				if (_CallBooleanMethodA == null)
-					_CallBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool));
+					_CallBooleanMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool));
 				return _CallBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte _CallSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte CallSByteMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _CallByteMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte CallByteMethod {
 			get {
-				if (_CallSByteMethod == null)
-					_CallSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte));
-				return _CallSByteMethod;
+				if (_CallByteMethod == null)
+					_CallByteMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
+				return _CallByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte _CallSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte CallSByteMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte _CallByteMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte CallByteMethodA {
 			get {
-				if (_CallSByteMethodA == null)
-					_CallSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte));
-				return _CallSByteMethodA;
+				if (_CallByteMethodA == null)
+					_CallByteMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte));
+				return _CallByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char _CallCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char CallCharMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _CallCharMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char CallCharMethod {
 			get {
 				if (_CallCharMethod == null)
-					_CallCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char));
+					_CallCharMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _CallCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char _CallCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char CallCharMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char _CallCharMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char CallCharMethodA {
 			get {
 				if (_CallCharMethodA == null)
-					_CallCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char));
+					_CallCharMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char));
 				return _CallCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short _CallShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short CallShortMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _CallShortMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short CallShortMethod {
 			get {
 				if (_CallShortMethod == null)
-					_CallShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short));
+					_CallShortMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _CallShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short _CallShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short CallShortMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short _CallShortMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short CallShortMethodA {
 			get {
 				if (_CallShortMethodA == null)
-					_CallShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short));
+					_CallShortMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short));
 				return _CallShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int _CallIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int CallIntMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _CallIntMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int CallIntMethod {
 			get {
 				if (_CallIntMethod == null)
-					_CallIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int));
+					_CallIntMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _CallIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int _CallIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int CallIntMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int _CallIntMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int CallIntMethodA {
 			get {
 				if (_CallIntMethodA == null)
-					_CallIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int));
+					_CallIntMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int));
 				return _CallIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long _CallLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long CallLongMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _CallLongMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long CallLongMethod {
 			get {
 				if (_CallLongMethod == null)
-					_CallLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long));
+					_CallLongMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _CallLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long _CallLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long CallLongMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long _CallLongMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long CallLongMethodA {
 			get {
 				if (_CallLongMethodA == null)
-					_CallLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long));
+					_CallLongMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long));
 				return _CallLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float _CallFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float CallFloatMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _CallFloatMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float CallFloatMethod {
 			get {
 				if (_CallFloatMethod == null)
-					_CallFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float));
+					_CallFloatMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _CallFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float _CallFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float CallFloatMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float _CallFloatMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float CallFloatMethodA {
 			get {
 				if (_CallFloatMethodA == null)
-					_CallFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float));
+					_CallFloatMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float));
 				return _CallFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double _CallDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double CallDoubleMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _CallDoubleMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double CallDoubleMethod {
 			get {
 				if (_CallDoubleMethod == null)
-					_CallDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double));
+					_CallDoubleMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _CallDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double _CallDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double CallDoubleMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double _CallDoubleMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double CallDoubleMethodA {
 			get {
 				if (_CallDoubleMethodA == null)
-					_CallDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double));
+					_CallDoubleMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double));
 				return _CallDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _CallVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID CallVoidMethod {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _CallVoidMethod;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr CallVoidMethod {
 			get {
 				if (_CallVoidMethod == null)
-					_CallVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
+					_CallVoidMethod = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _CallVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef _CallVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef CallVoidMethodA {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef _CallVoidMethodA;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef CallVoidMethodA {
 			get {
 				if (_CallVoidMethodA == null)
-					_CallVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef));
+					_CallVoidMethodA = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef));
 				return _CallVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference _CallNonvirtualObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference CallNonvirtualObjectMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JniLocalReference _CallNonvirtualObjectMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JniLocalReference CallNonvirtualObjectMethod {
 			get {
 				if (_CallNonvirtualObjectMethod == null)
-					_CallNonvirtualObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JniLocalReference));
+					_CallNonvirtualObjectMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _CallNonvirtualObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference _CallNonvirtualObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference CallNonvirtualObjectMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference _CallNonvirtualObjectMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference CallNonvirtualObjectMethodA {
 			get {
 				if (_CallNonvirtualObjectMethodA == null)
-					_CallNonvirtualObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_JniLocalReference));
+					_CallNonvirtualObjectMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference));
 				return _CallNonvirtualObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool _CallNonvirtualBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool CallNonvirtualBooleanMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_bool _CallNonvirtualBooleanMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_bool CallNonvirtualBooleanMethod {
 			get {
 				if (_CallNonvirtualBooleanMethod == null)
-					_CallNonvirtualBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_bool));
+					_CallNonvirtualBooleanMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_bool));
 				return _CallNonvirtualBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool _CallNonvirtualBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool CallNonvirtualBooleanMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_bool _CallNonvirtualBooleanMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_bool CallNonvirtualBooleanMethodA {
 			get {
 				if (_CallNonvirtualBooleanMethodA == null)
-					_CallNonvirtualBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_bool));
+					_CallNonvirtualBooleanMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_bool));
 				return _CallNonvirtualBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte _CallNonvirtualSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte CallNonvirtualSByteMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_sbyte _CallNonvirtualByteMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_sbyte CallNonvirtualByteMethod {
 			get {
-				if (_CallNonvirtualSByteMethod == null)
-					_CallNonvirtualSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_sbyte));
-				return _CallNonvirtualSByteMethod;
+				if (_CallNonvirtualByteMethod == null)
+					_CallNonvirtualByteMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_sbyte));
+				return _CallNonvirtualByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte _CallNonvirtualSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte CallNonvirtualSByteMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte _CallNonvirtualByteMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte CallNonvirtualByteMethodA {
 			get {
-				if (_CallNonvirtualSByteMethodA == null)
-					_CallNonvirtualSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_sbyte));
-				return _CallNonvirtualSByteMethodA;
+				if (_CallNonvirtualByteMethodA == null)
+					_CallNonvirtualByteMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte));
+				return _CallNonvirtualByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char _CallNonvirtualCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char CallNonvirtualCharMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_char _CallNonvirtualCharMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_char CallNonvirtualCharMethod {
 			get {
 				if (_CallNonvirtualCharMethod == null)
-					_CallNonvirtualCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_char));
+					_CallNonvirtualCharMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_char));
 				return _CallNonvirtualCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char _CallNonvirtualCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char CallNonvirtualCharMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_char _CallNonvirtualCharMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_char CallNonvirtualCharMethodA {
 			get {
 				if (_CallNonvirtualCharMethodA == null)
-					_CallNonvirtualCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_char));
+					_CallNonvirtualCharMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_char));
 				return _CallNonvirtualCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short _CallNonvirtualShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short CallNonvirtualShortMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_short _CallNonvirtualShortMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_short CallNonvirtualShortMethod {
 			get {
 				if (_CallNonvirtualShortMethod == null)
-					_CallNonvirtualShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_short));
+					_CallNonvirtualShortMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_short));
 				return _CallNonvirtualShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short _CallNonvirtualShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short CallNonvirtualShortMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_short _CallNonvirtualShortMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_short CallNonvirtualShortMethodA {
 			get {
 				if (_CallNonvirtualShortMethodA == null)
-					_CallNonvirtualShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_short));
+					_CallNonvirtualShortMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_short));
 				return _CallNonvirtualShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int _CallNonvirtualIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int CallNonvirtualIntMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_int _CallNonvirtualIntMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_int CallNonvirtualIntMethod {
 			get {
 				if (_CallNonvirtualIntMethod == null)
-					_CallNonvirtualIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_int));
+					_CallNonvirtualIntMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_int));
 				return _CallNonvirtualIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int _CallNonvirtualIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int CallNonvirtualIntMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_int _CallNonvirtualIntMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_int CallNonvirtualIntMethodA {
 			get {
 				if (_CallNonvirtualIntMethodA == null)
-					_CallNonvirtualIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_int));
+					_CallNonvirtualIntMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_int));
 				return _CallNonvirtualIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long _CallNonvirtualLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long CallNonvirtualLongMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_long _CallNonvirtualLongMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_long CallNonvirtualLongMethod {
 			get {
 				if (_CallNonvirtualLongMethod == null)
-					_CallNonvirtualLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_long));
+					_CallNonvirtualLongMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_long));
 				return _CallNonvirtualLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long _CallNonvirtualLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long CallNonvirtualLongMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_long _CallNonvirtualLongMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_long CallNonvirtualLongMethodA {
 			get {
 				if (_CallNonvirtualLongMethodA == null)
-					_CallNonvirtualLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_long));
+					_CallNonvirtualLongMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_long));
 				return _CallNonvirtualLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float _CallNonvirtualFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float CallNonvirtualFloatMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_float _CallNonvirtualFloatMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_float CallNonvirtualFloatMethod {
 			get {
 				if (_CallNonvirtualFloatMethod == null)
-					_CallNonvirtualFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_float));
+					_CallNonvirtualFloatMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_float));
 				return _CallNonvirtualFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float _CallNonvirtualFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float CallNonvirtualFloatMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_float _CallNonvirtualFloatMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_float CallNonvirtualFloatMethodA {
 			get {
 				if (_CallNonvirtualFloatMethodA == null)
-					_CallNonvirtualFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_float));
+					_CallNonvirtualFloatMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_float));
 				return _CallNonvirtualFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double _CallNonvirtualDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double CallNonvirtualDoubleMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_double _CallNonvirtualDoubleMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_double CallNonvirtualDoubleMethod {
 			get {
 				if (_CallNonvirtualDoubleMethod == null)
-					_CallNonvirtualDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_double));
+					_CallNonvirtualDoubleMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_double));
 				return _CallNonvirtualDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double _CallNonvirtualDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double CallNonvirtualDoubleMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_double _CallNonvirtualDoubleMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_double CallNonvirtualDoubleMethodA {
 			get {
 				if (_CallNonvirtualDoubleMethodA == null)
-					_CallNonvirtualDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef_double));
+					_CallNonvirtualDoubleMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef_double));
 				return _CallNonvirtualDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID _CallNonvirtualVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID CallNonvirtualVoidMethod {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr _CallNonvirtualVoidMethod;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr CallNonvirtualVoidMethod {
 			get {
 				if (_CallNonvirtualVoidMethod == null)
-					_CallNonvirtualVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID));
+					_CallNonvirtualVoidMethod = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr));
 				return _CallNonvirtualVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef _CallNonvirtualVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef CallNonvirtualVoidMethodA {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef _CallNonvirtualVoidMethodA;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef CallNonvirtualVoidMethodA {
 			get {
 				if (_CallNonvirtualVoidMethodA == null)
-					_CallNonvirtualVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniReferenceSafeHandle_JniInstanceMethodID_JValueRef));
+					_CallNonvirtualVoidMethodA = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_JniReferenceSafeHandle_IntPtr_JValueRef));
 				return _CallNonvirtualVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID _GetFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID GetFieldID {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr _GetFieldID;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr GetFieldID {
 			get {
 				if (_GetFieldID == null)
-					_GetFieldID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniInstanceFieldID));
+					_GetFieldID = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr));
 				return _GetFieldID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference _GetObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference GetObjectField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference _GetObjectField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference GetObjectField {
 			get {
 				if (_GetObjectField == null)
-					_GetObjectField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniLocalReference));
+					_GetObjectField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _GetObjectField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool _GetBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool GetBooleanField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _GetBooleanField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool GetBooleanField {
 			get {
 				if (_GetBooleanField == null)
-					_GetBooleanField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool));
+					_GetBooleanField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _GetBooleanField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte _GetByteField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte GetByteField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _GetByteField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte GetByteField {
 			get {
 				if (_GetByteField == null)
-					_GetByteField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte));
+					_GetByteField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
 				return _GetByteField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char _GetCharField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char GetCharField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _GetCharField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char GetCharField {
 			get {
 				if (_GetCharField == null)
-					_GetCharField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char));
+					_GetCharField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _GetCharField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short _GetShortField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short GetShortField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _GetShortField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short GetShortField {
 			get {
 				if (_GetShortField == null)
-					_GetShortField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short));
+					_GetShortField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _GetShortField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int _GetIntField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int GetIntField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _GetIntField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int GetIntField {
 			get {
 				if (_GetIntField == null)
-					_GetIntField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int));
+					_GetIntField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _GetIntField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long _GetLongField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long GetLongField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _GetLongField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long GetLongField {
 			get {
 				if (_GetLongField == null)
-					_GetLongField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long));
+					_GetLongField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _GetLongField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float _GetFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float GetFloatField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _GetFloatField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float GetFloatField {
 			get {
 				if (_GetFloatField == null)
-					_GetFloatField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float));
+					_GetFloatField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _GetFloatField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double _GetDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double GetDoubleField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _GetDoubleField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double GetDoubleField {
 			get {
 				if (_GetDoubleField == null)
-					_GetDoubleField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double));
+					_GetDoubleField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _GetDoubleField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle _SetObjectField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle SetObjectField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle _SetObjectField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle SetObjectField {
 			get {
 				if (_SetObjectField == null)
-					_SetObjectField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_JniReferenceSafeHandle));
+					_SetObjectField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle));
 				return _SetObjectField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool _SetBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool SetBooleanField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _SetBooleanField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool SetBooleanField {
 			get {
 				if (_SetBooleanField == null)
-					_SetBooleanField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_bool));
+					_SetBooleanField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _SetBooleanField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte _SetByteField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte SetByteField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _SetByteField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte SetByteField {
 			get {
 				if (_SetByteField == null)
-					_SetByteField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_sbyte));
+					_SetByteField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
 				return _SetByteField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char _SetCharField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char SetCharField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _SetCharField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char SetCharField {
 			get {
 				if (_SetCharField == null)
-					_SetCharField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_char));
+					_SetCharField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _SetCharField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short _SetShortField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short SetShortField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _SetShortField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short SetShortField {
 			get {
 				if (_SetShortField == null)
-					_SetShortField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_short));
+					_SetShortField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _SetShortField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int _SetIntField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int SetIntField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _SetIntField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int SetIntField {
 			get {
 				if (_SetIntField == null)
-					_SetIntField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_int));
+					_SetIntField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _SetIntField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long _SetLongField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long SetLongField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _SetLongField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long SetLongField {
 			get {
 				if (_SetLongField == null)
-					_SetLongField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_long));
+					_SetLongField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _SetLongField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float _SetFloatField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float SetFloatField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _SetFloatField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float SetFloatField {
 			get {
 				if (_SetFloatField == null)
-					_SetFloatField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_float));
+					_SetFloatField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _SetFloatField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double _SetDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double SetDoubleField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _SetDoubleField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double SetDoubleField {
 			get {
 				if (_SetDoubleField == null)
-					_SetDoubleField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniInstanceFieldID_double));
+					_SetDoubleField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _SetDoubleField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID _GetStaticMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID GetStaticMethodID {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr _GetStaticMethodID;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr GetStaticMethodID {
 			get {
 				if (_GetStaticMethodID == null)
-					_GetStaticMethodID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticMethodID));
+					_GetStaticMethodID = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr));
 				return _GetStaticMethodID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference _CallStaticObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference CallStaticObjectMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference _CallStaticObjectMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference CallStaticObjectMethod {
 			get {
 				if (_CallStaticObjectMethod == null)
-					_CallStaticObjectMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JniLocalReference));
+					_CallStaticObjectMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _CallStaticObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference _CallStaticObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference CallStaticObjectMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference _CallStaticObjectMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference CallStaticObjectMethodA {
 			get {
 				if (_CallStaticObjectMethodA == null)
-					_CallStaticObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_JniLocalReference));
+					_CallStaticObjectMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_JniLocalReference));
 				return _CallStaticObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool _CallStaticBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool CallStaticBooleanMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _CallStaticBooleanMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool CallStaticBooleanMethod {
 			get {
 				if (_CallStaticBooleanMethod == null)
-					_CallStaticBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_bool));
+					_CallStaticBooleanMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _CallStaticBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool _CallStaticBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool CallStaticBooleanMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool _CallStaticBooleanMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool CallStaticBooleanMethodA {
 			get {
 				if (_CallStaticBooleanMethodA == null)
-					_CallStaticBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_bool));
+					_CallStaticBooleanMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_bool));
 				return _CallStaticBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte _CallStaticSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte CallStaticSByteMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _CallStaticByteMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte CallStaticByteMethod {
 			get {
-				if (_CallStaticSByteMethod == null)
-					_CallStaticSByteMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_sbyte));
-				return _CallStaticSByteMethod;
+				if (_CallStaticByteMethod == null)
+					_CallStaticByteMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
+				return _CallStaticByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte _CallStaticSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte CallStaticSByteMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte _CallStaticByteMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte CallStaticByteMethodA {
 			get {
-				if (_CallStaticSByteMethodA == null)
-					_CallStaticSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_sbyte));
-				return _CallStaticSByteMethodA;
+				if (_CallStaticByteMethodA == null)
+					_CallStaticByteMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_sbyte));
+				return _CallStaticByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char _CallStaticCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char CallStaticCharMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _CallStaticCharMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char CallStaticCharMethod {
 			get {
 				if (_CallStaticCharMethod == null)
-					_CallStaticCharMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_char));
+					_CallStaticCharMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _CallStaticCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char _CallStaticCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char CallStaticCharMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char _CallStaticCharMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char CallStaticCharMethodA {
 			get {
 				if (_CallStaticCharMethodA == null)
-					_CallStaticCharMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_char));
+					_CallStaticCharMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_char));
 				return _CallStaticCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short _CallStaticShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short CallStaticShortMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _CallStaticShortMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short CallStaticShortMethod {
 			get {
 				if (_CallStaticShortMethod == null)
-					_CallStaticShortMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_short));
+					_CallStaticShortMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _CallStaticShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short _CallStaticShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short CallStaticShortMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short _CallStaticShortMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short CallStaticShortMethodA {
 			get {
 				if (_CallStaticShortMethodA == null)
-					_CallStaticShortMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_short));
+					_CallStaticShortMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_short));
 				return _CallStaticShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int _CallStaticIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int CallStaticIntMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _CallStaticIntMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int CallStaticIntMethod {
 			get {
 				if (_CallStaticIntMethod == null)
-					_CallStaticIntMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_int));
+					_CallStaticIntMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _CallStaticIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int _CallStaticIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int CallStaticIntMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int _CallStaticIntMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int CallStaticIntMethodA {
 			get {
 				if (_CallStaticIntMethodA == null)
-					_CallStaticIntMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_int));
+					_CallStaticIntMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_int));
 				return _CallStaticIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long _CallStaticLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long CallStaticLongMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _CallStaticLongMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long CallStaticLongMethod {
 			get {
 				if (_CallStaticLongMethod == null)
-					_CallStaticLongMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_long));
+					_CallStaticLongMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _CallStaticLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long _CallStaticLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long CallStaticLongMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long _CallStaticLongMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long CallStaticLongMethodA {
 			get {
 				if (_CallStaticLongMethodA == null)
-					_CallStaticLongMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_long));
+					_CallStaticLongMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_long));
 				return _CallStaticLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float _CallStaticFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float CallStaticFloatMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _CallStaticFloatMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float CallStaticFloatMethod {
 			get {
 				if (_CallStaticFloatMethod == null)
-					_CallStaticFloatMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_float));
+					_CallStaticFloatMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _CallStaticFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float _CallStaticFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float CallStaticFloatMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float _CallStaticFloatMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float CallStaticFloatMethodA {
 			get {
 				if (_CallStaticFloatMethodA == null)
-					_CallStaticFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_float));
+					_CallStaticFloatMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_float));
 				return _CallStaticFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double _CallStaticDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double CallStaticDoubleMethod {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _CallStaticDoubleMethod;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double CallStaticDoubleMethod {
 			get {
 				if (_CallStaticDoubleMethod == null)
-					_CallStaticDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_double));
+					_CallStaticDoubleMethod = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _CallStaticDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double _CallStaticDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double CallStaticDoubleMethodA {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double _CallStaticDoubleMethodA;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double CallStaticDoubleMethodA {
 			get {
 				if (_CallStaticDoubleMethodA == null)
-					_CallStaticDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef_double));
+					_CallStaticDoubleMethodA = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef_double));
 				return _CallStaticDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID _CallStaticVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID CallStaticVoidMethod {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _CallStaticVoidMethod;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr CallStaticVoidMethod {
 			get {
 				if (_CallStaticVoidMethod == null)
-					_CallStaticVoidMethod = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID));
+					_CallStaticVoidMethod = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _CallStaticVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef _CallStaticVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef CallStaticVoidMethodA {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef _CallStaticVoidMethodA;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef CallStaticVoidMethodA {
 			get {
 				if (_CallStaticVoidMethodA == null)
-					_CallStaticVoidMethodA = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticMethodID_JValueRef));
+					_CallStaticVoidMethodA = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JValueRef));
 				return _CallStaticVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID _GetStaticFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID GetStaticFieldID {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr _GetStaticFieldID;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr GetStaticFieldID {
 			get {
 				if (_GetStaticFieldID == null)
-					_GetStaticFieldID = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string_string_JniStaticFieldID));
+					_GetStaticFieldID = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_string_string_IntPtr));
 				return _GetStaticFieldID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference _GetStaticObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference GetStaticObjectField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference _GetStaticObjectField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference GetStaticObjectField {
 			get {
 				if (_GetStaticObjectField == null)
-					_GetStaticObjectField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniLocalReference));
+					_GetStaticObjectField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniLocalReference));
 				return _GetStaticObjectField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool _GetStaticBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool GetStaticBooleanField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _GetStaticBooleanField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool GetStaticBooleanField {
 			get {
 				if (_GetStaticBooleanField == null)
-					_GetStaticBooleanField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool));
+					_GetStaticBooleanField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _GetStaticBooleanField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte _GetStaticByteField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte GetStaticByteField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _GetStaticByteField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte GetStaticByteField {
 			get {
 				if (_GetStaticByteField == null)
-					_GetStaticByteField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte));
+					_GetStaticByteField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
 				return _GetStaticByteField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char _GetStaticCharField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char GetStaticCharField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _GetStaticCharField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char GetStaticCharField {
 			get {
 				if (_GetStaticCharField == null)
-					_GetStaticCharField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char));
+					_GetStaticCharField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _GetStaticCharField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short _GetStaticShortField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short GetStaticShortField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _GetStaticShortField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short GetStaticShortField {
 			get {
 				if (_GetStaticShortField == null)
-					_GetStaticShortField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short));
+					_GetStaticShortField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _GetStaticShortField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int _GetStaticIntField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int GetStaticIntField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _GetStaticIntField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int GetStaticIntField {
 			get {
 				if (_GetStaticIntField == null)
-					_GetStaticIntField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int));
+					_GetStaticIntField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _GetStaticIntField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long _GetStaticLongField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long GetStaticLongField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _GetStaticLongField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long GetStaticLongField {
 			get {
 				if (_GetStaticLongField == null)
-					_GetStaticLongField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long));
+					_GetStaticLongField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _GetStaticLongField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float _GetStaticFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float GetStaticFloatField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _GetStaticFloatField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float GetStaticFloatField {
 			get {
 				if (_GetStaticFloatField == null)
-					_GetStaticFloatField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float));
+					_GetStaticFloatField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _GetStaticFloatField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double _GetStaticDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double GetStaticDoubleField {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _GetStaticDoubleField;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double GetStaticDoubleField {
 			get {
 				if (_GetStaticDoubleField == null)
-					_GetStaticDoubleField = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double));
+					_GetStaticDoubleField = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _GetStaticDoubleField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle _SetStaticObjectField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle SetStaticObjectField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle _SetStaticObjectField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle SetStaticObjectField {
 			get {
 				if (_SetStaticObjectField == null)
-					_SetStaticObjectField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_JniReferenceSafeHandle));
+					_SetStaticObjectField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_JniReferenceSafeHandle));
 				return _SetStaticObjectField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool _SetStaticBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool SetStaticBooleanField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool _SetStaticBooleanField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool SetStaticBooleanField {
 			get {
 				if (_SetStaticBooleanField == null)
-					_SetStaticBooleanField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_bool));
+					_SetStaticBooleanField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_bool));
 				return _SetStaticBooleanField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte _SetStaticByteField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte SetStaticByteField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte _SetStaticByteField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte SetStaticByteField {
 			get {
 				if (_SetStaticByteField == null)
-					_SetStaticByteField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_sbyte));
+					_SetStaticByteField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_sbyte));
 				return _SetStaticByteField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char _SetStaticCharField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char SetStaticCharField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char _SetStaticCharField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char SetStaticCharField {
 			get {
 				if (_SetStaticCharField == null)
-					_SetStaticCharField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_char));
+					_SetStaticCharField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_char));
 				return _SetStaticCharField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short _SetStaticShortField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short SetStaticShortField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short _SetStaticShortField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short SetStaticShortField {
 			get {
 				if (_SetStaticShortField == null)
-					_SetStaticShortField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_short));
+					_SetStaticShortField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_short));
 				return _SetStaticShortField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int _SetStaticIntField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int SetStaticIntField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _SetStaticIntField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int SetStaticIntField {
 			get {
 				if (_SetStaticIntField == null)
-					_SetStaticIntField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_int));
+					_SetStaticIntField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _SetStaticIntField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long _SetStaticLongField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long SetStaticLongField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long _SetStaticLongField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long SetStaticLongField {
 			get {
 				if (_SetStaticLongField == null)
-					_SetStaticLongField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_long));
+					_SetStaticLongField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_long));
 				return _SetStaticLongField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float _SetStaticFloatField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float SetStaticFloatField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float _SetStaticFloatField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float SetStaticFloatField {
 			get {
 				if (_SetStaticFloatField == null)
-					_SetStaticFloatField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_float));
+					_SetStaticFloatField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_float));
 				return _SetStaticFloatField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double _SetStaticDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double SetStaticDoubleField {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double _SetStaticDoubleField;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double SetStaticDoubleField {
 			get {
 				if (_SetStaticDoubleField == null)
-					_SetStaticDoubleField = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniStaticFieldID_double));
+					_SetStaticDoubleField = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_double));
 				return _SetStaticDoubleField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference _NewString;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference NewString {
+		JniFunc_JNIEnvPtr_IntPtr_int_JniLocalReference _NewString;
+		public JniFunc_JNIEnvPtr_IntPtr_int_JniLocalReference NewString {
 			get {
 				if (_NewString == null)
-					_NewString = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_JniLocalReference));
+					_NewString = (JniFunc_JNIEnvPtr_IntPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JNIEnvPtr_IntPtr_int_JniLocalReference));
 				return _NewString;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetStringLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetStringLength {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _GetStringLength;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int GetStringLength {
 			get {
 				if (_GetStringLength == null)
-					_GetStringLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_GetStringLength = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _GetStringLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetStringChars;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetStringChars {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetStringChars;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetStringChars {
 			get {
 				if (_GetStringChars == null)
-					_GetStringChars = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetStringChars = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetStringChars;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr _ReleaseStringChars;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr ReleaseStringChars {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _ReleaseStringChars;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr ReleaseStringChars {
 			get {
 				if (_ReleaseStringChars == null)
-					_ReleaseStringChars = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr));
+					_ReleaseStringChars = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _ReleaseStringChars;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference _NewStringUTF;
-		public JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference NewStringUTF {
+		JniFunc_JNIEnvPtr_string_JniLocalReference _NewStringUTF;
+		public JniFunc_JNIEnvPtr_string_JniLocalReference NewStringUTF {
 			get {
 				if (_NewStringUTF == null)
-					_NewStringUTF = (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JniEnvironmentSafeHandle_string_JniLocalReference));
+					_NewStringUTF = (JniFunc_JNIEnvPtr_string_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JNIEnvPtr_string_JniLocalReference));
 				return _NewStringUTF;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetStringUTFLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetStringUTFLength {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _GetStringUTFLength;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int GetStringUTFLength {
 			get {
 				if (_GetStringUTFLength == null)
-					_GetStringUTFLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_GetStringUTFLength = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _GetStringUTFLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string _GetStringUTFChars;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string GetStringUTFChars {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string _GetStringUTFChars;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string GetStringUTFChars {
 			get {
 				if (_GetStringUTFChars == null)
-					_GetStringUTFChars = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string));
+					_GetStringUTFChars = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string));
 				return _GetStringUTFChars;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string _ReleaseStringUTFChars;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string ReleaseStringUTFChars {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_string _ReleaseStringUTFChars;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_string ReleaseStringUTFChars {
 			get {
 				if (_ReleaseStringUTFChars == null)
-					_ReleaseStringUTFChars = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string));
+					_ReleaseStringUTFChars = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_string));
 				return _ReleaseStringUTFChars;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _GetArrayLength;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int GetArrayLength {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _GetArrayLength;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int GetArrayLength {
 			get {
 				if (_GetArrayLength == null)
-					_GetArrayLength = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_GetArrayLength = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _GetArrayLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference _NewObjectArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference NewObjectArray {
+		JniFunc_JNIEnvPtr_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference _NewObjectArray;
+		public JniFunc_JNIEnvPtr_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference NewObjectArray {
 			get {
 				if (_NewObjectArray == null)
-					_NewObjectArray = (JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference));
+					_NewObjectArray = (JniFunc_JNIEnvPtr_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JNIEnvPtr_int_JniReferenceSafeHandle_JniReferenceSafeHandle_JniLocalReference));
 				return _NewObjectArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference _GetObjectArrayElement;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference GetObjectArrayElement {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int_JniLocalReference _GetObjectArrayElement;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int_JniLocalReference GetObjectArrayElement {
 			get {
 				if (_GetObjectArrayElement == null)
-					_GetObjectArrayElement = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniLocalReference));
+					_GetObjectArrayElement = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int_JniLocalReference));
 				return _GetObjectArrayElement;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle _SetObjectArrayElement;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle SetObjectArrayElement {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_JniReferenceSafeHandle _SetObjectArrayElement;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_JniReferenceSafeHandle SetObjectArrayElement {
 			get {
 				if (_SetObjectArrayElement == null)
-					_SetObjectArrayElement = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_JniReferenceSafeHandle));
+					_SetObjectArrayElement = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_JniReferenceSafeHandle) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_JniReferenceSafeHandle));
 				return _SetObjectArrayElement;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewBooleanArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewBooleanArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewBooleanArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewBooleanArray {
 			get {
 				if (_NewBooleanArray == null)
-					_NewBooleanArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewBooleanArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewBooleanArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewByteArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewByteArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewByteArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewByteArray {
 			get {
 				if (_NewByteArray == null)
-					_NewByteArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewByteArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewByteArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewCharArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewCharArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewCharArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewCharArray {
 			get {
 				if (_NewCharArray == null)
-					_NewCharArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewCharArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewCharArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewShortArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewShortArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewShortArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewShortArray {
 			get {
 				if (_NewShortArray == null)
-					_NewShortArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewShortArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewShortArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewIntArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewIntArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewIntArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewIntArray {
 			get {
 				if (_NewIntArray == null)
-					_NewIntArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewIntArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewIntArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewLongArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewLongArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewLongArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewLongArray {
 			get {
 				if (_NewLongArray == null)
-					_NewLongArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewLongArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewLongArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewFloatArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewFloatArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewFloatArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewFloatArray {
 			get {
 				if (_NewFloatArray == null)
-					_NewFloatArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewFloatArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewFloatArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference _NewDoubleArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference NewDoubleArray {
+		JniFunc_JNIEnvPtr_int_JniLocalReference _NewDoubleArray;
+		public JniFunc_JNIEnvPtr_int_JniLocalReference NewDoubleArray {
 			get {
 				if (_NewDoubleArray == null)
-					_NewDoubleArray = (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_JniLocalReference));
+					_NewDoubleArray = (JniFunc_JNIEnvPtr_int_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JNIEnvPtr_int_JniLocalReference));
 				return _NewDoubleArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetBooleanArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetBooleanArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetBooleanArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetBooleanArrayElements {
 			get {
 				if (_GetBooleanArrayElements == null)
-					_GetBooleanArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetBooleanArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetBooleanArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetByteArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetByteArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetByteArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetByteArrayElements {
 			get {
 				if (_GetByteArrayElements == null)
-					_GetByteArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetByteArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetByteArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetCharArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetCharArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetCharArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetCharArrayElements {
 			get {
 				if (_GetCharArrayElements == null)
-					_GetCharArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetCharArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetCharArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetShortArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetShortArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetShortArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetShortArrayElements {
 			get {
 				if (_GetShortArrayElements == null)
-					_GetShortArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetShortArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetShortArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetIntArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetIntArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetIntArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetIntArrayElements {
 			get {
 				if (_GetIntArrayElements == null)
-					_GetIntArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetIntArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetIntArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetLongArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetLongArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetLongArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetLongArrayElements {
 			get {
 				if (_GetLongArrayElements == null)
-					_GetLongArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetLongArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetLongArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetFloatArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetFloatArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetFloatArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetFloatArrayElements {
 			get {
 				if (_GetFloatArrayElements == null)
-					_GetFloatArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetFloatArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetFloatArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetDoubleArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetDoubleArrayElements {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetDoubleArrayElements;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetDoubleArrayElements {
 			get {
 				if (_GetDoubleArrayElements == null)
-					_GetDoubleArrayElements = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetDoubleArrayElements = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetDoubleArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseBooleanArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseBooleanArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseBooleanArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseBooleanArrayElements {
 			get {
 				if (_ReleaseBooleanArrayElements == null)
-					_ReleaseBooleanArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseBooleanArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseBooleanArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseByteArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseByteArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseByteArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseByteArrayElements {
 			get {
 				if (_ReleaseByteArrayElements == null)
-					_ReleaseByteArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseByteArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseByteArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseCharArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseCharArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseCharArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseCharArrayElements {
 			get {
 				if (_ReleaseCharArrayElements == null)
-					_ReleaseCharArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseCharArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseCharArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseShortArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseShortArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseShortArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseShortArrayElements {
 			get {
 				if (_ReleaseShortArrayElements == null)
-					_ReleaseShortArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseShortArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseShortArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseIntArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseIntArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseIntArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseIntArrayElements {
 			get {
 				if (_ReleaseIntArrayElements == null)
-					_ReleaseIntArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseIntArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseIntArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseLongArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseLongArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseLongArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseLongArrayElements {
 			get {
 				if (_ReleaseLongArrayElements == null)
-					_ReleaseLongArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseLongArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseLongArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseFloatArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseFloatArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseFloatArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseFloatArrayElements {
 			get {
 				if (_ReleaseFloatArrayElements == null)
-					_ReleaseFloatArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseFloatArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseFloatArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleaseDoubleArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleaseDoubleArrayElements {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleaseDoubleArrayElements;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleaseDoubleArrayElements {
 			get {
 				if (_ReleaseDoubleArrayElements == null)
-					_ReleaseDoubleArrayElements = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleaseDoubleArrayElements = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleaseDoubleArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetBooleanArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetBooleanArrayRegion {
 			get {
 				if (_GetBooleanArrayRegion == null)
-					_GetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetBooleanArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetBooleanArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetByteArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetByteArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetByteArrayRegion {
 			get {
 				if (_GetByteArrayRegion == null)
-					_GetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetByteArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetByteArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetCharArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetCharArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetCharArrayRegion {
 			get {
 				if (_GetCharArrayRegion == null)
-					_GetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetCharArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetCharArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetShortArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetShortArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetShortArrayRegion {
 			get {
 				if (_GetShortArrayRegion == null)
-					_GetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetShortArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetShortArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetIntArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetIntArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetIntArrayRegion {
 			get {
 				if (_GetIntArrayRegion == null)
-					_GetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetIntArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetIntArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetLongArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetLongArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetLongArrayRegion {
 			get {
 				if (_GetLongArrayRegion == null)
-					_GetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetLongArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetLongArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetFloatArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetFloatArrayRegion {
 			get {
 				if (_GetFloatArrayRegion == null)
-					_GetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetFloatArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetFloatArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetDoubleArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetDoubleArrayRegion {
 			get {
 				if (_GetDoubleArrayRegion == null)
-					_GetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetDoubleArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetDoubleArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetBooleanArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetBooleanArrayRegion {
 			get {
 				if (_SetBooleanArrayRegion == null)
-					_SetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetBooleanArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetBooleanArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetByteArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetByteArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetByteArrayRegion {
 			get {
 				if (_SetByteArrayRegion == null)
-					_SetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetByteArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetByteArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetCharArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetCharArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetCharArrayRegion {
 			get {
 				if (_SetCharArrayRegion == null)
-					_SetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetCharArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetCharArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetShortArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetShortArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetShortArrayRegion {
 			get {
 				if (_SetShortArrayRegion == null)
-					_SetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetShortArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetShortArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetIntArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetIntArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetIntArrayRegion {
 			get {
 				if (_SetIntArrayRegion == null)
-					_SetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetIntArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetIntArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetLongArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetLongArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetLongArrayRegion {
 			get {
 				if (_SetLongArrayRegion == null)
-					_SetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetLongArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetLongArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetFloatArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetFloatArrayRegion {
 			get {
 				if (_SetFloatArrayRegion == null)
-					_SetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetFloatArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetFloatArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _SetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr SetDoubleArrayRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _SetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr SetDoubleArrayRegion {
 			get {
 				if (_SetDoubleArrayRegion == null)
-					_SetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_SetDoubleArrayRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _SetDoubleArrayRegion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int RegisterNatives {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int RegisterNatives {
 			get {
 				if (_RegisterNatives == null)
-					_RegisterNatives = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int));
+					_RegisterNatives = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniNativeMethodRegistrationArray_int_int));
 				return _RegisterNatives;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _UnregisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int UnregisterNatives {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _UnregisterNatives;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int UnregisterNatives {
 			get {
 				if (_UnregisterNatives == null)
-					_UnregisterNatives = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_UnregisterNatives = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _UnregisterNatives;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _MonitorEnter;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int MonitorEnter {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _MonitorEnter;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int MonitorEnter {
 			get {
 				if (_MonitorEnter == null)
-					_MonitorEnter = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_MonitorEnter = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _MonitorEnter;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int _MonitorExit;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int MonitorExit {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int _MonitorExit;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int MonitorExit {
 			get {
 				if (_MonitorExit == null)
-					_MonitorExit = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int));
+					_MonitorExit = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_int));
 				return _MonitorExit;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int _GetJavaVM;
-		public JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int GetJavaVM {
+		JniFunc_JNIEnvPtr_outIntPtr_int _GetJavaVM;
+		public JniFunc_JNIEnvPtr_outIntPtr_int GetJavaVM {
 			get {
 				if (_GetJavaVM == null)
-					_GetJavaVM = (JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JniEnvironmentSafeHandle_outJavaVMSafeHandle_int));
+					_GetJavaVM = (JniFunc_JNIEnvPtr_outIntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JNIEnvPtr_outIntPtr_int));
 				return _GetJavaVM;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetStringRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetStringRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetStringRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetStringRegion {
 			get {
 				if (_GetStringRegion == null)
-					_GetStringRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetStringRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetStringRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr _GetStringUTFRegion;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr GetStringUTFRegion {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr _GetStringUTFRegion;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr GetStringUTFRegion {
 			get {
 				if (_GetStringUTFRegion == null)
-					_GetStringUTFRegion = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_int_int_IntPtr));
+					_GetStringUTFRegion = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_int_int_IntPtr));
 				return _GetStringUTFRegion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr _GetPrimitiveArrayCritical;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr GetPrimitiveArrayCritical {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr _GetPrimitiveArrayCritical;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr GetPrimitiveArrayCritical {
 			get {
 				if (_GetPrimitiveArrayCritical == null)
-					_GetPrimitiveArrayCritical = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_IntPtr));
+					_GetPrimitiveArrayCritical = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_IntPtr));
 				return _GetPrimitiveArrayCritical;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int _ReleasePrimitiveArrayCritical;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int ReleasePrimitiveArrayCritical {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int _ReleasePrimitiveArrayCritical;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int ReleasePrimitiveArrayCritical {
 			get {
 				if (_ReleasePrimitiveArrayCritical == null)
-					_ReleasePrimitiveArrayCritical = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_int));
+					_ReleasePrimitiveArrayCritical = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_int));
 				return _ReleasePrimitiveArrayCritical;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string _GetStringCritical;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string GetStringCritical {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string _GetStringCritical;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string GetStringCritical {
 			get {
 				if (_GetStringCritical == null)
-					_GetStringCritical = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr_string));
+					_GetStringCritical = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr_string));
 				return _GetStringCritical;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string _ReleaseStringCritical;
-		public JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string ReleaseStringCritical {
+		JniAction_JNIEnvPtr_JniReferenceSafeHandle_string _ReleaseStringCritical;
+		public JniAction_JNIEnvPtr_JniReferenceSafeHandle_string ReleaseStringCritical {
 			get {
 				if (_ReleaseStringCritical == null)
-					_ReleaseStringCritical = (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JniEnvironmentSafeHandle_JniReferenceSafeHandle_string));
+					_ReleaseStringCritical = (JniAction_JNIEnvPtr_JniReferenceSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JNIEnvPtr_JniReferenceSafeHandle_string));
 				return _ReleaseStringCritical;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference _NewWeakGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference NewWeakGlobalRef {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniWeakGlobalReference _NewWeakGlobalRef;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniWeakGlobalReference NewWeakGlobalRef {
 			get {
 				if (_NewWeakGlobalRef == null)
-					_NewWeakGlobalRef = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniWeakGlobalReference));
+					_NewWeakGlobalRef = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniWeakGlobalReference) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniWeakGlobalReference));
 				return _NewWeakGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteWeakGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteWeakGlobalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteWeakGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteWeakGlobalRef {
 			get {
 				if (_DeleteWeakGlobalRef == null)
-					_DeleteWeakGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteWeakGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteWeakGlobalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_bool _ExceptionCheck;
-		public JniFunc_JniEnvironmentSafeHandle_bool ExceptionCheck {
+		JniFunc_JNIEnvPtr_bool _ExceptionCheck;
+		public JniFunc_JNIEnvPtr_bool ExceptionCheck {
 			get {
 				if (_ExceptionCheck == null)
-					_ExceptionCheck = (JniFunc_JniEnvironmentSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JniEnvironmentSafeHandle_bool));
+					_ExceptionCheck = (JniFunc_JNIEnvPtr_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JNIEnvPtr_bool));
 				return _ExceptionCheck;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference _NewDirectByteBuffer;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference NewDirectByteBuffer {
+		JniFunc_JNIEnvPtr_IntPtr_long_JniLocalReference _NewDirectByteBuffer;
+		public JniFunc_JNIEnvPtr_IntPtr_long_JniLocalReference NewDirectByteBuffer {
 			get {
 				if (_NewDirectByteBuffer == null)
-					_NewDirectByteBuffer = (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_JniLocalReference));
+					_NewDirectByteBuffer = (JniFunc_JNIEnvPtr_IntPtr_long_JniLocalReference) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JNIEnvPtr_IntPtr_long_JniLocalReference));
 				return _NewDirectByteBuffer;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr _GetDirectBufferAddress;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr GetDirectBufferAddress {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr _GetDirectBufferAddress;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr GetDirectBufferAddress {
 			get {
 				if (_GetDirectBufferAddress == null)
-					_GetDirectBufferAddress = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_IntPtr));
+					_GetDirectBufferAddress = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_IntPtr));
 				return _GetDirectBufferAddress;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long _GetDirectBufferCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long GetDirectBufferCapacity {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_long _GetDirectBufferCapacity;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_long GetDirectBufferCapacity {
 			get {
 				if (_GetDirectBufferCapacity == null)
-					_GetDirectBufferCapacity = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_long));
+					_GetDirectBufferCapacity = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_long));
 				return _GetDirectBufferCapacity;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType _GetObjectRefType;
-		public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType GetObjectRefType {
+		JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniObjectReferenceType _GetObjectRefType;
+		public JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniObjectReferenceType GetObjectRefType {
 			get {
 				if (_GetObjectRefType == null)
-					_GetObjectRefType = (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenceType));
+					_GetObjectRefType = (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JNIEnvPtr_JniReferenceSafeHandle_JniObjectReferenceType));
 				return _GetObjectRefType;
 			}
 		}
@@ -5153,158 +5125,103 @@ public JniFunc_JniEnvironmentSafeHandle_JniReferenceSafeHandle_JniObjectReferenc
 #if FEATURE_HANDLES_ARE_INTPTRS
 namespace
 #if _NAMESPACE_PER_HANDLE
-	Java.Interop.IntPtrs
+	Java.Interop.JIIntPtrs
 #else
 	Java.Interop
 #endif
 {
 
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int (JNIEnvPtr env);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_string_jobject_IntPtr_int_jobject (JNIEnvPtr env, string name, jobject loader, IntPtr buf, int bufLen);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_string_jobject (JNIEnvPtr env, string classname);
-	unsafe delegate jinstanceMethodID JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID (JNIEnvPtr env, jobject method);
-	unsafe delegate jinstanceFieldID JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID (JNIEnvPtr env, jobject field);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool_jobject (JNIEnvPtr env, jobject cls, jinstanceMethodID jmethod, bool isStatic);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jobject (JNIEnvPtr env, jobject jclass);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool (JNIEnvPtr env, jobject clazz1, jobject clazz2);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool_jobject (JNIEnvPtr env, jobject cls, jinstanceFieldID jfieldID, bool isStatic);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_int (JNIEnvPtr env, jobject obj);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_string_int (JNIEnvPtr env, jobject clazz, string message);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject (JNIEnvPtr env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle (JNIEnvPtr env);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_string (JNIEnvPtr env, string msg);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_int_int (JNIEnvPtr env, int capacity);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_IntPtr (JNIEnvPtr env, IntPtr jobject);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject (JNIEnvPtr env, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject (JNIEnvPtr env, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jinstanceMethodID JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceMethodID (JNIEnvPtr env, jobject kls, string name, string signature);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_bool (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_sbyte (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_sbyte (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_char (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_char (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_short (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_short (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_int (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_int (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_long (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_long (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_float (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_float (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_double (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_double (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef (JNIEnvPtr env, jobject jobject, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_jobject (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_jobject (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_bool (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_bool (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_sbyte (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_sbyte (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_char (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_char (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_short (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_short (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_int (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_int (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_long (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_long (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_float (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_float (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_double (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_double (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef (JNIEnvPtr env, jobject jobject, jobject jclass, jinstanceMethodID jmethod, JValue* parms);
-	unsafe delegate jinstanceFieldID JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceFieldID (JNIEnvPtr env, jobject jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, jobject val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double (JNIEnvPtr env, jobject jobject, jinstanceFieldID jfieldID, double val);
-	unsafe delegate jstaticMethodID JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticMethodID (JNIEnvPtr env, jobject jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_jobject (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_jobject (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_bool (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_bool (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_sbyte (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_sbyte (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_char (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_char (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_short (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_short (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_int (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_int (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_long (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_long (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_float (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_float (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_double (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_double (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef (JNIEnvPtr env, jobject jclass, jstaticMethodID jmethod, JValue* parms);
-	unsafe delegate jstaticFieldID JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticFieldID (JNIEnvPtr env, jobject jclass, string name, string sig);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate sbyte JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate char JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate short JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate float JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate double JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, jobject val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, bool val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, sbyte val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, char val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, short val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, int val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, long val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, float val);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double (JNIEnvPtr env, jobject jclass, jstaticFieldID jfieldID, double val);
+	unsafe delegate int JniFunc_JNIEnvPtr_int (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject (JNIEnvPtr env, string name, jobject loader, IntPtr buffer, int bufferLength);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject (JNIEnvPtr env, string classname);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject (JNIEnvPtr env, jobject klass, IntPtr method, bool isStatic);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject (JNIEnvPtr env, jobject klass);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_bool (JNIEnvPtr env, jobject class1, jobject class2);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_int (JNIEnvPtr env, jobject toThrow);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_string_int (JNIEnvPtr env, jobject klass, string message);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr_string (JNIEnvPtr env, string message);
+	unsafe delegate int JniFunc_JNIEnvPtr_int_int (JNIEnvPtr env, int capacity);
+	unsafe delegate void JniAction_JNIEnvPtr_IntPtr (JNIEnvPtr env, IntPtr @object);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_string_string_IntPtr (JNIEnvPtr env, jobject klass, string name, string signature);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, IntPtr field, jobject value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr field, bool value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr field, sbyte value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr field, char value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr field, short value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr field, int value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr field, long value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr field, float value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr field, double value);
 	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject (JNIEnvPtr env, IntPtr unicodeChars, int len);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr (JNIEnvPtr env, jobject @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_IntPtr (JNIEnvPtr env, jobject @string, IntPtr chars);
-	unsafe delegate string JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string (JNIEnvPtr env, jobject @string, IntPtr isCopy);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_string (JNIEnvPtr env, jobject @string, string utf);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_int_jobject_jobject_jobject (JNIEnvPtr env, int length, jobject elementClass, jobject initialElement);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_jobject_int_jobject (JNIEnvPtr env, jobject array, int index);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_int_jobject (JNIEnvPtr env, jobject array, int index, jobject value);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_int_jobject (JNIEnvPtr env, int length);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int (JNIEnvPtr env, jobject array, IntPtr elems, int mode);
-	unsafe delegate void JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr (JNIEnvPtr env, jobject array, int start, int len, IntPtr buf);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_jobject_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, jobject jclass, JniNativeMethodRegistration [] methods, int nMethods);
-	unsafe delegate int JniFunc_JniEnvironmentSafeHandle_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
-	unsafe delegate bool JniFunc_JniEnvironmentSafeHandle_bool (JNIEnvPtr env);
-	unsafe delegate jobject JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject (JNIEnvPtr env, IntPtr address, long capacity);
-	unsafe delegate IntPtr JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr (JNIEnvPtr env, jobject buf);
-	unsafe delegate long JniFunc_JniEnvironmentSafeHandle_jobject_long (JNIEnvPtr env, jobject buf);
-	unsafe delegate JniObjectReferenceType JniFunc_JniEnvironmentSafeHandle_jobject_JniObjectReferenceType (JNIEnvPtr env, jobject jobject);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_int_jobject (JNIEnvPtr env, IntPtr unicodeChars, int length);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate string JniFunc_JNIEnvPtr_jobject_IntPtr_string (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_string (JNIEnvPtr env, jobject @string, string utf);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject_jobject_jobject (JNIEnvPtr env, int length, jobject elementClass, jobject initialElement);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index, jobject value);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject (JNIEnvPtr env, int length);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_int_IntPtr (JNIEnvPtr env, jobject array, int start, int length, IntPtr buffer);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, jobject klass, JniNativeMethodRegistration [] methods, int numMethods);
+	unsafe delegate int JniFunc_JNIEnvPtr_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
+	unsafe delegate bool JniFunc_JNIEnvPtr_bool (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_long_jobject (JNIEnvPtr env, IntPtr address, long capacity);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_long (JNIEnvPtr env, jobject buffer);
+	unsafe delegate JniObjectReferenceType JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType (JNIEnvPtr env, jobject @object);
 
 	partial class JniEnvironment {
 
 	internal static partial class Activator {
 
-		public static unsafe JniObjectReference AllocObject (JniObjectReference jclass)
+		public static unsafe JniObjectReference AllocObject (JniObjectReference klass)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 
-			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.SafeHandle, jclass.Handle);
+			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.EnvironmentPointer, klass.Handle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5314,14 +5231,16 @@ public static unsafe JniObjectReference AllocObject (JniObjectReference jclass)
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniObjectReference NewObject (JniObjectReference jclass, jinstanceMethodID jmethod)
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5331,14 +5250,16 @@ public static unsafe JniObjectReference NewObject (JniObjectReference jclass, ji
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		public static unsafe JniObjectReference NewObject (JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5356,7 +5277,7 @@ public static unsafe int GetArrayLength (JniObjectReference array_ptr)
 			if (array_ptr.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array_ptr` must not be IntPtr.Zero.", "array_ptr");
 
-			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.SafeHandle, array_ptr.Handle);
+			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.EnvironmentPointer, array_ptr.Handle);
 			return tmp;
 		}
 
@@ -5365,7 +5286,7 @@ public static unsafe JniObjectReference NewObjectArray (int length, JniObjectRef
 			if (elementClass.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`elementClass` must not be IntPtr.Zero.", "elementClass");
 
-			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.SafeHandle, length, elementClass.Handle, initialElement.Handle);
+			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.EnvironmentPointer, length, elementClass.Handle, initialElement.Handle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5380,7 +5301,7 @@ public static unsafe JniObjectReference GetObjectArrayElement (JniObjectReferenc
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.SafeHandle, array.Handle, index);
+			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array.Handle, index);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5395,7 +5316,7 @@ public static unsafe void SetObjectArrayElement (JniObjectReference array, int i
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.SafeHandle, array.Handle, index, value.Handle);
+			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array.Handle, index, value.Handle);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5405,56 +5326,56 @@ public static unsafe void SetObjectArrayElement (JniObjectReference array, int i
 
 		public static unsafe JniObjectReference NewBooleanArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewByteArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewCharArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewShortArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewIntArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewLongArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewFloatArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		public static unsafe JniObjectReference NewDoubleArray (int length)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.SafeHandle, length);
+			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.EnvironmentPointer, length);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
@@ -5464,7 +5385,7 @@ public static unsafe IntPtr GetBooleanArrayElements (JniObjectReference array, I
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5473,7 +5394,7 @@ public static unsafe IntPtr GetByteArrayElements (JniObjectReference array, IntP
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5482,7 +5403,7 @@ public static unsafe IntPtr GetCharArrayElements (JniObjectReference array, IntP
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5491,7 +5412,7 @@ public static unsafe IntPtr GetShortArrayElements (JniObjectReference array, Int
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5500,7 +5421,7 @@ public static unsafe IntPtr GetIntArrayElements (JniObjectReference array, IntPt
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5509,7 +5430,7 @@ public static unsafe IntPtr GetLongArrayElements (JniObjectReference array, IntP
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5518,7 +5439,7 @@ public static unsafe IntPtr GetFloatArrayElements (JniObjectReference array, Int
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
@@ -5527,98 +5448,98 @@ public static unsafe IntPtr GetDoubleArrayElements (JniObjectReference array, In
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
 			return tmp;
 		}
 
-		public static unsafe void ReleaseBooleanArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseBooleanArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseByteArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseByteArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseCharArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseCharArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseShortArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseShortArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseIntArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseIntArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseLongArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseLongArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseFloatArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseFloatArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		public static unsafe void ReleaseDoubleArrayElements (JniObjectReference array, IntPtr elems, int mode)
+		public static unsafe void ReleaseDoubleArrayElements (JniObjectReference array, IntPtr elements, int mode)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (elems == IntPtr.Zero)
-				throw new ArgumentException ("'elems' must not be IntPtr.Zero.", "elems");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
 
-			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.SafeHandle, array.Handle, elems, mode);
+			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
 		}
 
-		internal static unsafe void GetBooleanArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		internal static unsafe void GetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5626,14 +5547,14 @@ internal static unsafe void GetBooleanArrayRegion (JniObjectReference array, int
 
 		}
 
-		public static unsafe void GetByteArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5641,14 +5562,14 @@ public static unsafe void GetByteArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void GetCharArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5656,14 +5577,14 @@ public static unsafe void GetCharArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void GetShortArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5671,14 +5592,14 @@ public static unsafe void GetShortArrayRegion (JniObjectReference array, int sta
 
 		}
 
-		public static unsafe void GetIntArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5686,14 +5607,14 @@ public static unsafe void GetIntArrayRegion (JniObjectReference array, int start
 
 		}
 
-		public static unsafe void GetLongArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5701,14 +5622,14 @@ public static unsafe void GetLongArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void GetFloatArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5716,14 +5637,14 @@ public static unsafe void GetFloatArrayRegion (JniObjectReference array, int sta
 
 		}
 
-		public static unsafe void GetDoubleArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void GetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5731,14 +5652,14 @@ public static unsafe void GetDoubleArrayRegion (JniObjectReference array, int st
 
 		}
 
-		internal static unsafe void SetBooleanArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		internal static unsafe void SetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5746,14 +5667,14 @@ internal static unsafe void SetBooleanArrayRegion (JniObjectReference array, int
 
 		}
 
-		public static unsafe void SetByteArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5761,14 +5682,14 @@ public static unsafe void SetByteArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void SetCharArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5776,14 +5697,14 @@ public static unsafe void SetCharArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void SetShortArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5791,14 +5712,14 @@ public static unsafe void SetShortArrayRegion (JniObjectReference array, int sta
 
 		}
 
-		public static unsafe void SetIntArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5806,14 +5727,14 @@ public static unsafe void SetIntArrayRegion (JniObjectReference array, int start
 
 		}
 
-		public static unsafe void SetLongArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5821,14 +5742,14 @@ public static unsafe void SetLongArrayRegion (JniObjectReference array, int star
 
 		}
 
-		public static unsafe void SetFloatArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5836,14 +5757,14 @@ public static unsafe void SetFloatArrayRegion (JniObjectReference array, int sta
 
 		}
 
-		public static unsafe void SetDoubleArrayRegion (JniObjectReference array, int start, int len, IntPtr buf)
+		public static unsafe void SetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
 		{
 			if (array.Handle == IntPtr.Zero)
 				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.SafeHandle, array.Handle, start, len, buf);
+			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array.Handle, start, length, buffer);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -5852,217 +5773,340 @@ public static unsafe void SetDoubleArrayRegion (JniObjectReference array, int st
 		}
 	}
 
-	public static partial class Errors {
+	public static partial class Exceptions {
 
-		public static unsafe int Throw (JniObjectReference obj)
+		public static unsafe int Throw (JniObjectReference toThrow)
 		{
-			if (obj.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
+			if (toThrow.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`toThrow` must not be IntPtr.Zero.", "toThrow");
 
-			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.SafeHandle, obj.Handle);
+			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.EnvironmentPointer, toThrow.Handle);
 			return tmp;
 		}
 
-		public static unsafe int ThrowNew (JniObjectReference clazz, string message)
+		public static unsafe int ThrowNew (JniObjectReference klass, string message)
 		{
-			if (clazz.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`clazz` must not be IntPtr.Zero.", "clazz");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 			if (message == null)
 				throw new ArgumentNullException ("message");
 
-			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.SafeHandle, clazz.Handle, message);
+			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.EnvironmentPointer, klass.Handle, message);
 			return tmp;
 		}
 
 		internal static unsafe JniObjectReference ExceptionOccurred ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.SafeHandle);
+			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.EnvironmentPointer);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
 		internal static unsafe void ExceptionDescribe ()
 		{
-			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.SafeHandle);
+			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.EnvironmentPointer);
 		}
 
 		internal static unsafe void ExceptionClear ()
 		{
-			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.SafeHandle);
+			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.EnvironmentPointer);
 		}
 
-		public static unsafe void FatalError (string msg)
+		public static unsafe void FatalError (string message)
 		{
-			if (msg == null)
-				throw new ArgumentNullException ("msg");
+			if (message == null)
+				throw new ArgumentNullException ("message");
 
-			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.SafeHandle, msg);
+			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.EnvironmentPointer, message);
 		}
 
 		internal static unsafe bool ExceptionCheck ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.SafeHandle);
+			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.EnvironmentPointer);
 			return tmp;
 		}
 	}
 
-	public static partial class Handles {
+	internal static partial class InstanceFields {
 
-		public static unsafe int PushLocalFrame (int capacity)
+		public static unsafe JniInstanceFieldInfo GetFieldID (JniObjectReference klass, string name, string signature)
 		{
-			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.SafeHandle, capacity);
-			return tmp;
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.EnvironmentPointer, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceFieldInfo (tmp);
 		}
 
-		public static unsafe JniObjectReference PopLocalFrame (JniObjectReference result)
+		internal static unsafe JniObjectReference GetObjectField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.SafeHandle, result.Handle);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniObjectReference NewGlobalRef (JniObjectReference jobject)
+		internal static unsafe bool GetBooleanField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.SafeHandle, jobject.Handle);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Global);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe void DeleteGlobalRef (IntPtr jobject)
+		internal static unsafe sbyte GetByteField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe void DeleteLocalRef (IntPtr jobject)
+		internal static unsafe char GetCharField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe JniObjectReference NewLocalRef (JniObjectReference jobject)
+		internal static unsafe short GetShortField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.SafeHandle, jobject.Handle);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		public static unsafe int EnsureLocalCapacity (int capacity)
+		internal static unsafe int GetIntField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.SafeHandle, capacity);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
 			return tmp;
 		}
 
-		public static unsafe int GetJavaVM (out IntPtr vm)
+		internal static unsafe long GetLongField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.SafeHandle, out vm);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
 			return tmp;
 		}
 
-		internal static unsafe JniObjectReference NewWeakGlobalRef (JniObjectReference jobject)
+		internal static unsafe float GetFloatField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject.Handle);
-			return new JniObjectReference (tmp, JniObjectReferenceType.WeakGlobal);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe void DeleteWeakGlobalRef (IntPtr jobject)
+		internal static unsafe double GetDoubleField (JniObjectReference @object, JniInstanceFieldInfo field)
 		{
-			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.SafeHandle, jobject);
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe JniObjectReferenceType GetObjectRefType (JniObjectReference jobject)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, JniObjectReference value)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.SafeHandle, jobject.Handle);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value.Handle);
 		}
-	}
 
-	public static partial class IO {
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, bool value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-		public static unsafe JniObjectReference NewDirectByteBuffer (IntPtr address, long capacity)
+			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, sbyte value)
 		{
-			if (address == IntPtr.Zero)
-				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.SafeHandle, address, capacity);
+			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, char value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
 		}
 
-		public static unsafe IntPtr GetDirectBufferAddress (JniObjectReference buf)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, short value)
 		{
-			if (buf.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`buf` must not be IntPtr.Zero.", "buf");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.SafeHandle, buf.Handle);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
 		}
 
-		public static unsafe long GetDirectBufferCapacity (JniObjectReference buf)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, int value)
 		{
-			if (buf.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`buf` must not be IntPtr.Zero.", "buf");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.SafeHandle, buf.Handle);
-			return tmp;
+			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
 		}
-	}
 
-	internal static partial class Members {
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, long value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
 
-		internal static unsafe JniObjectReference ToReflectedMethod (JniObjectReference cls, jinstanceMethodID jmethod, bool isStatic)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, float value)
 		{
-			if (cls.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`cls` must not be IntPtr.Zero.", "cls");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.SafeHandle, cls.Handle, jmethod, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
 		}
 
-		internal static unsafe JniObjectReference ToReflectedField (JniObjectReference cls, jinstanceFieldID jfieldID, bool isStatic)
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, double value)
 		{
-			if (cls.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`cls` must not be IntPtr.Zero.", "cls");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.SafeHandle, cls.Handle, jfieldID, isStatic);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
 		}
+	}
 
-		internal static unsafe jinstanceMethodID GetMethodID (JniObjectReference kls, string name, string signature)
+	internal static partial class InstanceMethods {
+
+		internal static unsafe JniInstanceMethodInfo GetMethodID (JniObjectReference klass, string name, string signature)
 		{
-			if (kls.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`kls` must not be IntPtr.Zero.", "kls");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 			if (name == null)
 				throw new ArgumentNullException ("name");
 			if (signature == null)
 				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.SafeHandle, kls.Handle, name, signature);
+			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.EnvironmentPointer, klass.Handle, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceMethodInfo (tmp);
 		}
 
-		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6072,14 +6116,16 @@ internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference j
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6089,14 +6135,16 @@ internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference j
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool CallBooleanMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6105,14 +6153,16 @@ internal static unsafe bool CallBooleanMethod (JniObjectReference jobject, jinst
 			return tmp;
 		}
 
-		internal static unsafe bool CallBooleanMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6121,14 +6171,16 @@ internal static unsafe bool CallBooleanMethod (JniObjectReference jobject, jinst
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallSByteMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6137,14 +6189,16 @@ internal static unsafe sbyte CallSByteMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallSByteMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallSByteMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6153,14 +6207,16 @@ internal static unsafe sbyte CallSByteMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe char CallCharMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6169,14 +6225,16 @@ internal static unsafe char CallCharMethod (JniObjectReference jobject, jinstanc
 			return tmp;
 		}
 
-		internal static unsafe char CallCharMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6185,14 +6243,16 @@ internal static unsafe char CallCharMethod (JniObjectReference jobject, jinstanc
 			return tmp;
 		}
 
-		internal static unsafe short CallShortMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6201,14 +6261,16 @@ internal static unsafe short CallShortMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe short CallShortMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6217,14 +6279,16 @@ internal static unsafe short CallShortMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe int CallIntMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6233,14 +6297,16 @@ internal static unsafe int CallIntMethod (JniObjectReference jobject, jinstanceM
 			return tmp;
 		}
 
-		internal static unsafe int CallIntMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6249,14 +6315,16 @@ internal static unsafe int CallIntMethod (JniObjectReference jobject, jinstanceM
 			return tmp;
 		}
 
-		internal static unsafe long CallLongMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6265,14 +6333,16 @@ internal static unsafe long CallLongMethod (JniObjectReference jobject, jinstanc
 			return tmp;
 		}
 
-		internal static unsafe long CallLongMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6281,14 +6351,16 @@ internal static unsafe long CallLongMethod (JniObjectReference jobject, jinstanc
 			return tmp;
 		}
 
-		internal static unsafe float CallFloatMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6297,14 +6369,16 @@ internal static unsafe float CallFloatMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe float CallFloatMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6313,14 +6387,16 @@ internal static unsafe float CallFloatMethod (JniObjectReference jobject, jinsta
 			return tmp;
 		}
 
-		internal static unsafe double CallDoubleMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6329,14 +6405,16 @@ internal static unsafe double CallDoubleMethod (JniObjectReference jobject, jins
 			return tmp;
 		}
 
-		internal static unsafe double CallDoubleMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6345,14 +6423,16 @@ internal static unsafe double CallDoubleMethod (JniObjectReference jobject, jins
 			return tmp;
 		}
 
-		internal static unsafe void CallVoidMethod (JniObjectReference jobject, jinstanceMethodID jmethod)
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod);
+			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6360,14 +6440,16 @@ internal static unsafe void CallVoidMethod (JniObjectReference jobject, jinstanc
 
 		}
 
-		internal static unsafe void CallVoidMethod (JniObjectReference jobject, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jmethod, parms);
+			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6375,16 +6457,18 @@ internal static unsafe void CallVoidMethod (JniObjectReference jobject, jinstanc
 
 		}
 
-		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6394,16 +6478,18 @@ internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectR
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6413,16 +6499,18 @@ internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectR
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6431,16 +6519,18 @@ internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference jobj
 			return tmp;
 		}
 
-		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6449,16 +6539,18 @@ internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference jobj
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6467,16 +6559,18 @@ internal static unsafe sbyte CallNonvirtualSByteMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallNonvirtualSByteMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualSByteMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6485,16 +6579,18 @@ internal static unsafe sbyte CallNonvirtualSByteMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6503,16 +6599,18 @@ internal static unsafe char CallNonvirtualCharMethod (JniObjectReference jobject
 			return tmp;
 		}
 
-		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6521,16 +6619,18 @@ internal static unsafe char CallNonvirtualCharMethod (JniObjectReference jobject
 			return tmp;
 		}
 
-		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6539,16 +6639,18 @@ internal static unsafe short CallNonvirtualShortMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6557,16 +6659,18 @@ internal static unsafe short CallNonvirtualShortMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6575,16 +6679,18 @@ internal static unsafe int CallNonvirtualIntMethod (JniObjectReference jobject,
 			return tmp;
 		}
 
-		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6593,16 +6699,18 @@ internal static unsafe int CallNonvirtualIntMethod (JniObjectReference jobject,
 			return tmp;
 		}
 
-		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6611,16 +6719,18 @@ internal static unsafe long CallNonvirtualLongMethod (JniObjectReference jobject
 			return tmp;
 		}
 
-		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6629,16 +6739,18 @@ internal static unsafe long CallNonvirtualLongMethod (JniObjectReference jobject
 			return tmp;
 		}
 
-		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6647,16 +6759,18 @@ internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6665,16 +6779,18 @@ internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference jobje
 			return tmp;
 		}
 
-		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6683,16 +6799,18 @@ internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference job
 			return tmp;
 		}
 
-		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6701,16 +6819,18 @@ internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference job
 			return tmp;
 		}
 
-		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod)
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod);
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -6718,403 +6838,7895 @@ internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference jobject
 
 		}
 
-		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference jobject, JniObjectReference jclass, jinstanceMethodID jmethod, JValue* parms)
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.SafeHandle, jobject.Handle, jclass.Handle, jmethod, parms);
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle, method.ID, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 		}
+	}
+
+	public static partial class IO {
 
-		public static unsafe jinstanceFieldID GetFieldID (JniObjectReference jclass, string name, string sig)
+		public static unsafe JniObjectReference NewDirectByteBuffer (IntPtr address, long capacity)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (address == IntPtr.Zero)
+				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
 
-			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.SafeHandle, jclass.Handle, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.EnvironmentPointer, address, capacity);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
-		}
-
-		internal static unsafe JniObjectReference GetObjectField (JniObjectReference jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe bool GetBooleanField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		public static unsafe IntPtr GetDirectBufferAddress (JniObjectReference buffer)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (buffer.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
 
-			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.EnvironmentPointer, buffer.Handle);
 			return tmp;
 		}
 
-		internal static unsafe sbyte GetByteField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		public static unsafe long GetDirectBufferCapacity (JniObjectReference buffer)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (buffer.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
 
-			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.EnvironmentPointer, buffer.Handle);
 			return tmp;
 		}
+	}
 
-		internal static unsafe char GetCharField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+	internal static partial class Monitors {
+
+		public static unsafe int MonitorEnter (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
 
-			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
 			return tmp;
 		}
 
-		internal static unsafe short GetShortField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		public static unsafe int MonitorExit (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
 
-			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
+			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
 			return tmp;
 		}
+	}
 
-		internal static unsafe int GetIntField (JniObjectReference jobject, jinstanceFieldID jfieldID)
-		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+	public static partial class References {
 
-			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
+		public static unsafe int PushLocalFrame (int capacity)
+		{
+			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.EnvironmentPointer, capacity);
 			return tmp;
 		}
 
-		internal static unsafe long GetLongField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		public static unsafe JniObjectReference PopLocalFrame (JniObjectReference result)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
-			return tmp;
+			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.EnvironmentPointer, result.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe float GetFloatField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		internal static unsafe JniObjectReference NewGlobalRef (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
-			return tmp;
+			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Global);
 		}
 
-		internal static unsafe double GetDoubleField (JniObjectReference jobject, jinstanceFieldID jfieldID)
+		internal static unsafe void DeleteGlobalRef (IntPtr @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID);
-			return tmp;
+			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, JniObjectReference val)
+		internal static unsafe void DeleteLocalRef (IntPtr @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val.Handle);
+			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.EnvironmentPointer, @object);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, bool val)
+		internal static unsafe JniObjectReference NewLocalRef (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, sbyte val)
+		public static unsafe int EnsureLocalCapacity (int capacity)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, char val)
+		public static unsafe int GetJavaVM (out IntPtr vm)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.EnvironmentPointer, out vm);
+			return tmp;
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, short val)
+		internal static unsafe JniObjectReference NewWeakGlobalRef (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.WeakGlobal);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, int val)
+		internal static unsafe void DeleteWeakGlobalRef (IntPtr @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, long val)
+		internal static unsafe JniObjectReferenceType GetObjectRefType (JniObjectReference @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
 
-			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return tmp;
 		}
+	}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, float val)
+	internal static partial class Reflection {
+
+		internal static unsafe JniObjectReference ToReflectedMethod (JniObjectReference klass, JniInstanceMethodInfo method, bool isStatic)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe void SetField (JniObjectReference jobject, jinstanceFieldID jfieldID, double val)
+		internal static unsafe JniObjectReference ToReflectedField (JniObjectReference klass, JniInstanceFieldInfo field, bool isStatic)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.SafeHandle, jobject.Handle, jfieldID, val);
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
+	}
 
-		public static unsafe jstaticMethodID GetStaticMethodID (JniObjectReference jclass, string name, string sig)
+	internal static partial class StaticFields {
+
+		public static unsafe JniStaticFieldInfo GetStaticFieldID (JniObjectReference klass, string name, string signature)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 			if (name == null)
 				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.SafeHandle, jclass.Handle, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.EnvironmentPointer, klass.Handle, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticFieldInfo (tmp);
 		}
 
-		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe JniObjectReference GetStaticObjectField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
-
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
-
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
 		}
 
-		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe bool GetStaticBooleanField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe sbyte GetStaticByteField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
 		}
 
-		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe char GetStaticCharField (JniObjectReference klass, JniStaticFieldInfo field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe short GetStaticShortField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe int GetStaticIntField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe long GetStaticLongField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe float GetStaticFloatField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe double GetStaticDoubleField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, JniObjectReference value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value.Handle);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, bool value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, sbyte value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, char value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, short value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, int value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, long value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, float value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, double value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+	}
+
+	internal static partial class StaticMethods {
+
+		public static unsafe JniStaticMethodInfo GetStaticMethodID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.EnvironmentPointer, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticMethodInfo (tmp);
+		}
+
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+	}
+
+	public static partial class Strings {
+
+		internal static unsafe JniObjectReference NewString (IntPtr unicodeChars, int length)
+		{
+			if (unicodeChars == IntPtr.Zero)
+				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
+
+			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.EnvironmentPointer, unicodeChars, length);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		internal static unsafe int GetStringLength (JniObjectReference @string)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.EnvironmentPointer, @string.Handle);
+			return tmp;
+		}
+
+		internal static unsafe IntPtr GetStringChars (JniObjectReference @string, IntPtr isCopy)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.EnvironmentPointer, @string.Handle, isCopy);
+			return tmp;
+		}
+
+		internal static unsafe void ReleaseStringChars (JniObjectReference @string, IntPtr chars)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+			if (chars == IntPtr.Zero)
+				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
+
+			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.EnvironmentPointer, @string.Handle, chars);
+		}
+	}
+
+	public static partial class Types {
+
+		internal static unsafe JniObjectReference DefineClass (string name, JniObjectReference loader, IntPtr buffer, int bufferLength)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (loader.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`loader` must not be IntPtr.Zero.", "loader");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.EnvironmentPointer, name, loader.Handle, buffer, bufferLength);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe JniObjectReference FindClass (string classname)
+		{
+			if (classname == null)
+				throw new ArgumentNullException ("classname");
+
+			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.EnvironmentPointer, classname);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe JniObjectReference GetSuperclass (JniObjectReference klass)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.EnvironmentPointer, klass.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe bool IsAssignableFrom (JniObjectReference class1, JniObjectReference class2)
+		{
+			if (class1.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`class1` must not be IntPtr.Zero.", "class1");
+			if (class2.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`class2` must not be IntPtr.Zero.", "class2");
+
+			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.EnvironmentPointer, class1.Handle, class2.Handle);
+			return tmp;
+		}
+
+		public static unsafe bool IsSameObject (JniObjectReference object1, JniObjectReference object2)
+		{
+			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.EnvironmentPointer, object1.Handle, object2.Handle);
+			return tmp;
+		}
+
+		public static unsafe JniObjectReference GetObjectClass (JniObjectReference @object)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		public static unsafe bool IsInstanceOf (JniObjectReference @object, JniObjectReference klass)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle);
+			return tmp;
+		}
+
+		internal static unsafe int RegisterNatives (JniObjectReference klass, JniNativeMethodRegistration [] methods, int numMethods)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.EnvironmentPointer, klass.Handle, methods, numMethods);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int UnregisterNatives (JniObjectReference klass)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.EnvironmentPointer, klass.Handle);
+			return tmp;
+		}
+	}
+
+	internal static partial class Versions {
+
+		internal static unsafe int GetVersion ()
+		{
+			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.EnvironmentPointer);
+			return tmp;
+		}
+	}
+	}
+
+	partial class JniEnvironmentInvoker {
+
+		internal JniNativeInterfaceStruct env;
+
+		public unsafe JniEnvironmentInvoker (JniNativeInterfaceStruct* p)
+		{
+			env = *p;
+		}
+
+
+		JniFunc_JNIEnvPtr_int _GetVersion;
+		public JniFunc_JNIEnvPtr_int GetVersion {
+			get {
+				if (_GetVersion == null)
+					_GetVersion = (JniFunc_JNIEnvPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JNIEnvPtr_int));
+				return _GetVersion;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject _DefineClass;
+		public JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject DefineClass {
+			get {
+				if (_DefineClass == null)
+					_DefineClass = (JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject));
+				return _DefineClass;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_string_jobject _FindClass;
+		public JniFunc_JNIEnvPtr_string_jobject FindClass {
+			get {
+				if (_FindClass == null)
+					_FindClass = (JniFunc_JNIEnvPtr_string_jobject) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JNIEnvPtr_string_jobject));
+				return _FindClass;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr _FromReflectedMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr FromReflectedMethod {
+			get {
+				if (_FromReflectedMethod == null)
+					_FromReflectedMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
+				return _FromReflectedMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr _FromReflectedField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr FromReflectedField {
+			get {
+				if (_FromReflectedField == null)
+					_FromReflectedField = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
+				return _FromReflectedField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject _ToReflectedMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject ToReflectedMethod {
+			get {
+				if (_ToReflectedMethod == null)
+					_ToReflectedMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject));
+				return _ToReflectedMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _GetSuperclass;
+		public JniFunc_JNIEnvPtr_jobject_jobject GetSuperclass {
+			get {
+				if (_GetSuperclass == null)
+					_GetSuperclass = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _GetSuperclass;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsAssignableFrom;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsAssignableFrom {
+			get {
+				if (_IsAssignableFrom == null)
+					_IsAssignableFrom = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
+				return _IsAssignableFrom;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject _ToReflectedField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject ToReflectedField {
+			get {
+				if (_ToReflectedField == null)
+					_ToReflectedField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject));
+				return _ToReflectedField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _Throw;
+		public JniFunc_JNIEnvPtr_jobject_int Throw {
+			get {
+				if (_Throw == null)
+					_Throw = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _Throw;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_string_int _ThrowNew;
+		public JniFunc_JNIEnvPtr_jobject_string_int ThrowNew {
+			get {
+				if (_ThrowNew == null)
+					_ThrowNew = (JniFunc_JNIEnvPtr_jobject_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JNIEnvPtr_jobject_string_int));
+				return _ThrowNew;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject _ExceptionOccurred;
+		public JniFunc_JNIEnvPtr_jobject ExceptionOccurred {
+			get {
+				if (_ExceptionOccurred == null)
+					_ExceptionOccurred = (JniFunc_JNIEnvPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JNIEnvPtr_jobject));
+				return _ExceptionOccurred;
+			}
+		}
+
+		JniAction_JNIEnvPtr _ExceptionDescribe;
+		public JniAction_JNIEnvPtr ExceptionDescribe {
+			get {
+				if (_ExceptionDescribe == null)
+					_ExceptionDescribe = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JNIEnvPtr));
+				return _ExceptionDescribe;
+			}
+		}
+
+		JniAction_JNIEnvPtr _ExceptionClear;
+		public JniAction_JNIEnvPtr ExceptionClear {
+			get {
+				if (_ExceptionClear == null)
+					_ExceptionClear = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JNIEnvPtr));
+				return _ExceptionClear;
+			}
+		}
+
+		JniAction_JNIEnvPtr_string _FatalError;
+		public JniAction_JNIEnvPtr_string FatalError {
+			get {
+				if (_FatalError == null)
+					_FatalError = (JniAction_JNIEnvPtr_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JNIEnvPtr_string));
+				return _FatalError;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_int _PushLocalFrame;
+		public JniFunc_JNIEnvPtr_int_int PushLocalFrame {
+			get {
+				if (_PushLocalFrame == null)
+					_PushLocalFrame = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JNIEnvPtr_int_int));
+				return _PushLocalFrame;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _PopLocalFrame;
+		public JniFunc_JNIEnvPtr_jobject_jobject PopLocalFrame {
+			get {
+				if (_PopLocalFrame == null)
+					_PopLocalFrame = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _PopLocalFrame;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _NewGlobalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewGlobalRef {
+			get {
+				if (_NewGlobalRef == null)
+					_NewGlobalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _NewGlobalRef;
+			}
+		}
+
+		JniAction_JNIEnvPtr_IntPtr _DeleteGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteGlobalRef {
+			get {
+				if (_DeleteGlobalRef == null)
+					_DeleteGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
+				return _DeleteGlobalRef;
+			}
+		}
+
+		JniAction_JNIEnvPtr_IntPtr _DeleteLocalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteLocalRef {
+			get {
+				if (_DeleteLocalRef == null)
+					_DeleteLocalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
+				return _DeleteLocalRef;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsSameObject;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsSameObject {
+			get {
+				if (_IsSameObject == null)
+					_IsSameObject = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
+				return _IsSameObject;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _NewLocalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewLocalRef {
+			get {
+				if (_NewLocalRef == null)
+					_NewLocalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _NewLocalRef;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_int _EnsureLocalCapacity;
+		public JniFunc_JNIEnvPtr_int_int EnsureLocalCapacity {
+			get {
+				if (_EnsureLocalCapacity == null)
+					_EnsureLocalCapacity = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JNIEnvPtr_int_int));
+				return _EnsureLocalCapacity;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _AllocObject;
+		public JniFunc_JNIEnvPtr_jobject_jobject AllocObject {
+			get {
+				if (_AllocObject == null)
+					_AllocObject = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _AllocObject;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _NewObject;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject NewObject {
+			get {
+				if (_NewObject == null)
+					_NewObject = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _NewObject;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _NewObjectA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject NewObjectA {
+			get {
+				if (_NewObjectA == null)
+					_NewObjectA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
+				return _NewObjectA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _GetObjectClass;
+		public JniFunc_JNIEnvPtr_jobject_jobject GetObjectClass {
+			get {
+				if (_GetObjectClass == null)
+					_GetObjectClass = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _GetObjectClass;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsInstanceOf;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsInstanceOf {
+			get {
+				if (_IsInstanceOf == null)
+					_IsInstanceOf = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
+				return _IsInstanceOf;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetMethodID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetMethodID {
+			get {
+				if (_GetMethodID == null)
+					_GetMethodID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
+				return _GetMethodID;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _CallObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject CallObjectMethod {
+			get {
+				if (_CallObjectMethod == null)
+					_CallObjectMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _CallObjectMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _CallObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject CallObjectMethodA {
+			get {
+				if (_CallObjectMethodA == null)
+					_CallObjectMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
+				return _CallObjectMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _CallBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool CallBooleanMethod {
+			get {
+				if (_CallBooleanMethod == null)
+					_CallBooleanMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
+				return _CallBooleanMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool _CallBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool CallBooleanMethodA {
+			get {
+				if (_CallBooleanMethodA == null)
+					_CallBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool));
+				return _CallBooleanMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _CallByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte CallByteMethod {
+			get {
+				if (_CallByteMethod == null)
+					_CallByteMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _CallByteMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte _CallByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte CallByteMethodA {
+			get {
+				if (_CallByteMethodA == null)
+					_CallByteMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte));
+				return _CallByteMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _CallCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char CallCharMethod {
+			get {
+				if (_CallCharMethod == null)
+					_CallCharMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
+				return _CallCharMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char _CallCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char CallCharMethodA {
+			get {
+				if (_CallCharMethodA == null)
+					_CallCharMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char));
+				return _CallCharMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _CallShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short CallShortMethod {
+			get {
+				if (_CallShortMethod == null)
+					_CallShortMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
+				return _CallShortMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short _CallShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short CallShortMethodA {
+			get {
+				if (_CallShortMethodA == null)
+					_CallShortMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short));
+				return _CallShortMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _CallIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int CallIntMethod {
+			get {
+				if (_CallIntMethod == null)
+					_CallIntMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
+				return _CallIntMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int _CallIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int CallIntMethodA {
+			get {
+				if (_CallIntMethodA == null)
+					_CallIntMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int));
+				return _CallIntMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _CallLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long CallLongMethod {
+			get {
+				if (_CallLongMethod == null)
+					_CallLongMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
+				return _CallLongMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long _CallLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long CallLongMethodA {
+			get {
+				if (_CallLongMethodA == null)
+					_CallLongMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long));
+				return _CallLongMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _CallFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float CallFloatMethod {
+			get {
+				if (_CallFloatMethod == null)
+					_CallFloatMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
+				return _CallFloatMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float _CallFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float CallFloatMethodA {
+			get {
+				if (_CallFloatMethodA == null)
+					_CallFloatMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float));
+				return _CallFloatMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _CallDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double CallDoubleMethod {
+			get {
+				if (_CallDoubleMethod == null)
+					_CallDoubleMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
+				return _CallDoubleMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double _CallDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double CallDoubleMethodA {
+			get {
+				if (_CallDoubleMethodA == null)
+					_CallDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double));
+				return _CallDoubleMethodA;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr _CallVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_IntPtr CallVoidMethod {
+			get {
+				if (_CallVoidMethod == null)
+					_CallVoidMethod = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
+				return _CallVoidMethod;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef _CallVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef CallVoidMethodA {
+			get {
+				if (_CallVoidMethodA == null)
+					_CallVoidMethodA = (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef));
+				return _CallVoidMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject _CallNonvirtualObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject CallNonvirtualObjectMethod {
+			get {
+				if (_CallNonvirtualObjectMethod == null)
+					_CallNonvirtualObjectMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject));
+				return _CallNonvirtualObjectMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject _CallNonvirtualObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject CallNonvirtualObjectMethodA {
+			get {
+				if (_CallNonvirtualObjectMethodA == null)
+					_CallNonvirtualObjectMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject));
+				return _CallNonvirtualObjectMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool _CallNonvirtualBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool CallNonvirtualBooleanMethod {
+			get {
+				if (_CallNonvirtualBooleanMethod == null)
+					_CallNonvirtualBooleanMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool));
+				return _CallNonvirtualBooleanMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool _CallNonvirtualBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool CallNonvirtualBooleanMethodA {
+			get {
+				if (_CallNonvirtualBooleanMethodA == null)
+					_CallNonvirtualBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool));
+				return _CallNonvirtualBooleanMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte _CallNonvirtualByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte CallNonvirtualByteMethod {
+			get {
+				if (_CallNonvirtualByteMethod == null)
+					_CallNonvirtualByteMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte));
+				return _CallNonvirtualByteMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte _CallNonvirtualByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte CallNonvirtualByteMethodA {
+			get {
+				if (_CallNonvirtualByteMethodA == null)
+					_CallNonvirtualByteMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte));
+				return _CallNonvirtualByteMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char _CallNonvirtualCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char CallNonvirtualCharMethod {
+			get {
+				if (_CallNonvirtualCharMethod == null)
+					_CallNonvirtualCharMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char));
+				return _CallNonvirtualCharMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char _CallNonvirtualCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char CallNonvirtualCharMethodA {
+			get {
+				if (_CallNonvirtualCharMethodA == null)
+					_CallNonvirtualCharMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char));
+				return _CallNonvirtualCharMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short _CallNonvirtualShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short CallNonvirtualShortMethod {
+			get {
+				if (_CallNonvirtualShortMethod == null)
+					_CallNonvirtualShortMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short));
+				return _CallNonvirtualShortMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short _CallNonvirtualShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short CallNonvirtualShortMethodA {
+			get {
+				if (_CallNonvirtualShortMethodA == null)
+					_CallNonvirtualShortMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short));
+				return _CallNonvirtualShortMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int _CallNonvirtualIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int CallNonvirtualIntMethod {
+			get {
+				if (_CallNonvirtualIntMethod == null)
+					_CallNonvirtualIntMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int));
+				return _CallNonvirtualIntMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int _CallNonvirtualIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int CallNonvirtualIntMethodA {
+			get {
+				if (_CallNonvirtualIntMethodA == null)
+					_CallNonvirtualIntMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int));
+				return _CallNonvirtualIntMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long _CallNonvirtualLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long CallNonvirtualLongMethod {
+			get {
+				if (_CallNonvirtualLongMethod == null)
+					_CallNonvirtualLongMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long));
+				return _CallNonvirtualLongMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long _CallNonvirtualLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long CallNonvirtualLongMethodA {
+			get {
+				if (_CallNonvirtualLongMethodA == null)
+					_CallNonvirtualLongMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long));
+				return _CallNonvirtualLongMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float _CallNonvirtualFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float CallNonvirtualFloatMethod {
+			get {
+				if (_CallNonvirtualFloatMethod == null)
+					_CallNonvirtualFloatMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float));
+				return _CallNonvirtualFloatMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float _CallNonvirtualFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float CallNonvirtualFloatMethodA {
+			get {
+				if (_CallNonvirtualFloatMethodA == null)
+					_CallNonvirtualFloatMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float));
+				return _CallNonvirtualFloatMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double _CallNonvirtualDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double CallNonvirtualDoubleMethod {
+			get {
+				if (_CallNonvirtualDoubleMethod == null)
+					_CallNonvirtualDoubleMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double));
+				return _CallNonvirtualDoubleMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double _CallNonvirtualDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double CallNonvirtualDoubleMethodA {
+			get {
+				if (_CallNonvirtualDoubleMethodA == null)
+					_CallNonvirtualDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double));
+				return _CallNonvirtualDoubleMethodA;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_jobject_IntPtr _CallNonvirtualVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_jobject_IntPtr CallNonvirtualVoidMethod {
+			get {
+				if (_CallNonvirtualVoidMethod == null)
+					_CallNonvirtualVoidMethod = (JniAction_JNIEnvPtr_jobject_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_jobject_IntPtr));
+				return _CallNonvirtualVoidMethod;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef _CallNonvirtualVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef CallNonvirtualVoidMethodA {
+			get {
+				if (_CallNonvirtualVoidMethodA == null)
+					_CallNonvirtualVoidMethodA = (JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef));
+				return _CallNonvirtualVoidMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetFieldID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetFieldID {
+			get {
+				if (_GetFieldID == null)
+					_GetFieldID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
+				return _GetFieldID;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _GetObjectField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject GetObjectField {
+			get {
+				if (_GetObjectField == null)
+					_GetObjectField = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _GetObjectField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _GetBooleanField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool GetBooleanField {
+			get {
+				if (_GetBooleanField == null)
+					_GetBooleanField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
+				return _GetBooleanField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _GetByteField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte GetByteField {
+			get {
+				if (_GetByteField == null)
+					_GetByteField = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _GetByteField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _GetCharField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char GetCharField {
+			get {
+				if (_GetCharField == null)
+					_GetCharField = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
+				return _GetCharField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _GetShortField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short GetShortField {
+			get {
+				if (_GetShortField == null)
+					_GetShortField = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
+				return _GetShortField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _GetIntField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int GetIntField {
+			get {
+				if (_GetIntField == null)
+					_GetIntField = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
+				return _GetIntField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _GetLongField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long GetLongField {
+			get {
+				if (_GetLongField == null)
+					_GetLongField = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
+				return _GetLongField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _GetFloatField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float GetFloatField {
+			get {
+				if (_GetFloatField == null)
+					_GetFloatField = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
+				return _GetFloatField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _GetDoubleField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double GetDoubleField {
+			get {
+				if (_GetDoubleField == null)
+					_GetDoubleField = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
+				return _GetDoubleField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_jobject _SetObjectField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_jobject SetObjectField {
+			get {
+				if (_SetObjectField == null)
+					_SetObjectField = (JniAction_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _SetObjectField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_bool _SetBooleanField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_bool SetBooleanField {
+			get {
+				if (_SetBooleanField == null)
+					_SetBooleanField = (JniAction_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_bool));
+				return _SetBooleanField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_sbyte _SetByteField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_sbyte SetByteField {
+			get {
+				if (_SetByteField == null)
+					_SetByteField = (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _SetByteField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_char _SetCharField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_char SetCharField {
+			get {
+				if (_SetCharField == null)
+					_SetCharField = (JniAction_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_char));
+				return _SetCharField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_short _SetShortField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_short SetShortField {
+			get {
+				if (_SetShortField == null)
+					_SetShortField = (JniAction_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_short));
+				return _SetShortField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _SetIntField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int SetIntField {
+			get {
+				if (_SetIntField == null)
+					_SetIntField = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _SetIntField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_long _SetLongField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_long SetLongField {
+			get {
+				if (_SetLongField == null)
+					_SetLongField = (JniAction_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_long));
+				return _SetLongField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_float _SetFloatField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_float SetFloatField {
+			get {
+				if (_SetFloatField == null)
+					_SetFloatField = (JniAction_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_float));
+				return _SetFloatField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_double _SetDoubleField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_double SetDoubleField {
+			get {
+				if (_SetDoubleField == null)
+					_SetDoubleField = (JniAction_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_double));
+				return _SetDoubleField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetStaticMethodID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetStaticMethodID {
+			get {
+				if (_GetStaticMethodID == null)
+					_GetStaticMethodID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
+				return _GetStaticMethodID;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _CallStaticObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject CallStaticObjectMethod {
+			get {
+				if (_CallStaticObjectMethod == null)
+					_CallStaticObjectMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _CallStaticObjectMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _CallStaticObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject CallStaticObjectMethodA {
+			get {
+				if (_CallStaticObjectMethodA == null)
+					_CallStaticObjectMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
+				return _CallStaticObjectMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _CallStaticBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool CallStaticBooleanMethod {
+			get {
+				if (_CallStaticBooleanMethod == null)
+					_CallStaticBooleanMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
+				return _CallStaticBooleanMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool _CallStaticBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool CallStaticBooleanMethodA {
+			get {
+				if (_CallStaticBooleanMethodA == null)
+					_CallStaticBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool));
+				return _CallStaticBooleanMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _CallStaticByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte CallStaticByteMethod {
+			get {
+				if (_CallStaticByteMethod == null)
+					_CallStaticByteMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _CallStaticByteMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte _CallStaticByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte CallStaticByteMethodA {
+			get {
+				if (_CallStaticByteMethodA == null)
+					_CallStaticByteMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte));
+				return _CallStaticByteMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _CallStaticCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char CallStaticCharMethod {
+			get {
+				if (_CallStaticCharMethod == null)
+					_CallStaticCharMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
+				return _CallStaticCharMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char _CallStaticCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char CallStaticCharMethodA {
+			get {
+				if (_CallStaticCharMethodA == null)
+					_CallStaticCharMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char));
+				return _CallStaticCharMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _CallStaticShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short CallStaticShortMethod {
+			get {
+				if (_CallStaticShortMethod == null)
+					_CallStaticShortMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
+				return _CallStaticShortMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short _CallStaticShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short CallStaticShortMethodA {
+			get {
+				if (_CallStaticShortMethodA == null)
+					_CallStaticShortMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short));
+				return _CallStaticShortMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _CallStaticIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int CallStaticIntMethod {
+			get {
+				if (_CallStaticIntMethod == null)
+					_CallStaticIntMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
+				return _CallStaticIntMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int _CallStaticIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int CallStaticIntMethodA {
+			get {
+				if (_CallStaticIntMethodA == null)
+					_CallStaticIntMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int));
+				return _CallStaticIntMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _CallStaticLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long CallStaticLongMethod {
+			get {
+				if (_CallStaticLongMethod == null)
+					_CallStaticLongMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
+				return _CallStaticLongMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long _CallStaticLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long CallStaticLongMethodA {
+			get {
+				if (_CallStaticLongMethodA == null)
+					_CallStaticLongMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long));
+				return _CallStaticLongMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _CallStaticFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float CallStaticFloatMethod {
+			get {
+				if (_CallStaticFloatMethod == null)
+					_CallStaticFloatMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
+				return _CallStaticFloatMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float _CallStaticFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float CallStaticFloatMethodA {
+			get {
+				if (_CallStaticFloatMethodA == null)
+					_CallStaticFloatMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float));
+				return _CallStaticFloatMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _CallStaticDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double CallStaticDoubleMethod {
+			get {
+				if (_CallStaticDoubleMethod == null)
+					_CallStaticDoubleMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
+				return _CallStaticDoubleMethod;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double _CallStaticDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double CallStaticDoubleMethodA {
+			get {
+				if (_CallStaticDoubleMethodA == null)
+					_CallStaticDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double));
+				return _CallStaticDoubleMethodA;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr _CallStaticVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_IntPtr CallStaticVoidMethod {
+			get {
+				if (_CallStaticVoidMethod == null)
+					_CallStaticVoidMethod = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
+				return _CallStaticVoidMethod;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef _CallStaticVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef CallStaticVoidMethodA {
+			get {
+				if (_CallStaticVoidMethodA == null)
+					_CallStaticVoidMethodA = (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef));
+				return _CallStaticVoidMethodA;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetStaticFieldID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetStaticFieldID {
+			get {
+				if (_GetStaticFieldID == null)
+					_GetStaticFieldID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
+				return _GetStaticFieldID;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _GetStaticObjectField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject GetStaticObjectField {
+			get {
+				if (_GetStaticObjectField == null)
+					_GetStaticObjectField = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _GetStaticObjectField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _GetStaticBooleanField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool GetStaticBooleanField {
+			get {
+				if (_GetStaticBooleanField == null)
+					_GetStaticBooleanField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
+				return _GetStaticBooleanField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _GetStaticByteField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte GetStaticByteField {
+			get {
+				if (_GetStaticByteField == null)
+					_GetStaticByteField = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _GetStaticByteField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _GetStaticCharField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char GetStaticCharField {
+			get {
+				if (_GetStaticCharField == null)
+					_GetStaticCharField = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
+				return _GetStaticCharField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _GetStaticShortField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short GetStaticShortField {
+			get {
+				if (_GetStaticShortField == null)
+					_GetStaticShortField = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
+				return _GetStaticShortField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _GetStaticIntField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int GetStaticIntField {
+			get {
+				if (_GetStaticIntField == null)
+					_GetStaticIntField = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
+				return _GetStaticIntField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _GetStaticLongField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long GetStaticLongField {
+			get {
+				if (_GetStaticLongField == null)
+					_GetStaticLongField = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
+				return _GetStaticLongField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _GetStaticFloatField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float GetStaticFloatField {
+			get {
+				if (_GetStaticFloatField == null)
+					_GetStaticFloatField = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
+				return _GetStaticFloatField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _GetStaticDoubleField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double GetStaticDoubleField {
+			get {
+				if (_GetStaticDoubleField == null)
+					_GetStaticDoubleField = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
+				return _GetStaticDoubleField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_jobject _SetStaticObjectField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_jobject SetStaticObjectField {
+			get {
+				if (_SetStaticObjectField == null)
+					_SetStaticObjectField = (JniAction_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_jobject));
+				return _SetStaticObjectField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_bool _SetStaticBooleanField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_bool SetStaticBooleanField {
+			get {
+				if (_SetStaticBooleanField == null)
+					_SetStaticBooleanField = (JniAction_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_bool));
+				return _SetStaticBooleanField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_sbyte _SetStaticByteField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_sbyte SetStaticByteField {
+			get {
+				if (_SetStaticByteField == null)
+					_SetStaticByteField = (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _SetStaticByteField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_char _SetStaticCharField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_char SetStaticCharField {
+			get {
+				if (_SetStaticCharField == null)
+					_SetStaticCharField = (JniAction_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_char));
+				return _SetStaticCharField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_short _SetStaticShortField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_short SetStaticShortField {
+			get {
+				if (_SetStaticShortField == null)
+					_SetStaticShortField = (JniAction_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_short));
+				return _SetStaticShortField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _SetStaticIntField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int SetStaticIntField {
+			get {
+				if (_SetStaticIntField == null)
+					_SetStaticIntField = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _SetStaticIntField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_long _SetStaticLongField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_long SetStaticLongField {
+			get {
+				if (_SetStaticLongField == null)
+					_SetStaticLongField = (JniAction_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_long));
+				return _SetStaticLongField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_float _SetStaticFloatField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_float SetStaticFloatField {
+			get {
+				if (_SetStaticFloatField == null)
+					_SetStaticFloatField = (JniAction_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_float));
+				return _SetStaticFloatField;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_double _SetStaticDoubleField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_double SetStaticDoubleField {
+			get {
+				if (_SetStaticDoubleField == null)
+					_SetStaticDoubleField = (JniAction_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_double));
+				return _SetStaticDoubleField;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_IntPtr_int_jobject _NewString;
+		public JniFunc_JNIEnvPtr_IntPtr_int_jobject NewString {
+			get {
+				if (_NewString == null)
+					_NewString = (JniFunc_JNIEnvPtr_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JNIEnvPtr_IntPtr_int_jobject));
+				return _NewString;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _GetStringLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetStringLength {
+			get {
+				if (_GetStringLength == null)
+					_GetStringLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _GetStringLength;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetStringChars;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetStringChars {
+			get {
+				if (_GetStringChars == null)
+					_GetStringChars = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetStringChars;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr _ReleaseStringChars;
+		public JniAction_JNIEnvPtr_jobject_IntPtr ReleaseStringChars {
+			get {
+				if (_ReleaseStringChars == null)
+					_ReleaseStringChars = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
+				return _ReleaseStringChars;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_string_jobject _NewStringUTF;
+		public JniFunc_JNIEnvPtr_string_jobject NewStringUTF {
+			get {
+				if (_NewStringUTF == null)
+					_NewStringUTF = (JniFunc_JNIEnvPtr_string_jobject) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JNIEnvPtr_string_jobject));
+				return _NewStringUTF;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _GetStringUTFLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetStringUTFLength {
+			get {
+				if (_GetStringUTFLength == null)
+					_GetStringUTFLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _GetStringUTFLength;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_string _GetStringUTFChars;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_string GetStringUTFChars {
+			get {
+				if (_GetStringUTFChars == null)
+					_GetStringUTFChars = (JniFunc_JNIEnvPtr_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_string));
+				return _GetStringUTFChars;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_string _ReleaseStringUTFChars;
+		public JniAction_JNIEnvPtr_jobject_string ReleaseStringUTFChars {
+			get {
+				if (_ReleaseStringUTFChars == null)
+					_ReleaseStringUTFChars = (JniAction_JNIEnvPtr_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JNIEnvPtr_jobject_string));
+				return _ReleaseStringUTFChars;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _GetArrayLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetArrayLength {
+			get {
+				if (_GetArrayLength == null)
+					_GetArrayLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _GetArrayLength;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject_jobject_jobject _NewObjectArray;
+		public JniFunc_JNIEnvPtr_int_jobject_jobject_jobject NewObjectArray {
+			get {
+				if (_NewObjectArray == null)
+					_NewObjectArray = (JniFunc_JNIEnvPtr_int_jobject_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JNIEnvPtr_int_jobject_jobject_jobject));
+				return _NewObjectArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int_jobject _GetObjectArrayElement;
+		public JniFunc_JNIEnvPtr_jobject_int_jobject GetObjectArrayElement {
+			get {
+				if (_GetObjectArrayElement == null)
+					_GetObjectArrayElement = (JniFunc_JNIEnvPtr_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JNIEnvPtr_jobject_int_jobject));
+				return _GetObjectArrayElement;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_jobject _SetObjectArrayElement;
+		public JniAction_JNIEnvPtr_jobject_int_jobject SetObjectArrayElement {
+			get {
+				if (_SetObjectArrayElement == null)
+					_SetObjectArrayElement = (JniAction_JNIEnvPtr_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JNIEnvPtr_jobject_int_jobject));
+				return _SetObjectArrayElement;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewBooleanArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewBooleanArray {
+			get {
+				if (_NewBooleanArray == null)
+					_NewBooleanArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewBooleanArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewByteArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewByteArray {
+			get {
+				if (_NewByteArray == null)
+					_NewByteArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewByteArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewCharArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewCharArray {
+			get {
+				if (_NewCharArray == null)
+					_NewCharArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewCharArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewShortArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewShortArray {
+			get {
+				if (_NewShortArray == null)
+					_NewShortArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewShortArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewIntArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewIntArray {
+			get {
+				if (_NewIntArray == null)
+					_NewIntArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewIntArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewLongArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewLongArray {
+			get {
+				if (_NewLongArray == null)
+					_NewLongArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewLongArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewFloatArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewFloatArray {
+			get {
+				if (_NewFloatArray == null)
+					_NewFloatArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewFloatArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_int_jobject _NewDoubleArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewDoubleArray {
+			get {
+				if (_NewDoubleArray == null)
+					_NewDoubleArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
+				return _NewDoubleArray;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetBooleanArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetBooleanArrayElements {
+			get {
+				if (_GetBooleanArrayElements == null)
+					_GetBooleanArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetBooleanArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetByteArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetByteArrayElements {
+			get {
+				if (_GetByteArrayElements == null)
+					_GetByteArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetByteArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetCharArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetCharArrayElements {
+			get {
+				if (_GetCharArrayElements == null)
+					_GetCharArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetCharArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetShortArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetShortArrayElements {
+			get {
+				if (_GetShortArrayElements == null)
+					_GetShortArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetShortArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetIntArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetIntArrayElements {
+			get {
+				if (_GetIntArrayElements == null)
+					_GetIntArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetIntArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetLongArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetLongArrayElements {
+			get {
+				if (_GetLongArrayElements == null)
+					_GetLongArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetLongArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetFloatArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetFloatArrayElements {
+			get {
+				if (_GetFloatArrayElements == null)
+					_GetFloatArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetFloatArrayElements;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetDoubleArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetDoubleArrayElements {
+			get {
+				if (_GetDoubleArrayElements == null)
+					_GetDoubleArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetDoubleArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseBooleanArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseBooleanArrayElements {
+			get {
+				if (_ReleaseBooleanArrayElements == null)
+					_ReleaseBooleanArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseBooleanArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseByteArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseByteArrayElements {
+			get {
+				if (_ReleaseByteArrayElements == null)
+					_ReleaseByteArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseByteArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseCharArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseCharArrayElements {
+			get {
+				if (_ReleaseCharArrayElements == null)
+					_ReleaseCharArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseCharArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseShortArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseShortArrayElements {
+			get {
+				if (_ReleaseShortArrayElements == null)
+					_ReleaseShortArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseShortArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseIntArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseIntArrayElements {
+			get {
+				if (_ReleaseIntArrayElements == null)
+					_ReleaseIntArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseIntArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseLongArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseLongArrayElements {
+			get {
+				if (_ReleaseLongArrayElements == null)
+					_ReleaseLongArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseLongArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseFloatArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseFloatArrayElements {
+			get {
+				if (_ReleaseFloatArrayElements == null)
+					_ReleaseFloatArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseFloatArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseDoubleArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseDoubleArrayElements {
+			get {
+				if (_ReleaseDoubleArrayElements == null)
+					_ReleaseDoubleArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleaseDoubleArrayElements;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetBooleanArrayRegion {
+			get {
+				if (_GetBooleanArrayRegion == null)
+					_GetBooleanArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetBooleanArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetByteArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetByteArrayRegion {
+			get {
+				if (_GetByteArrayRegion == null)
+					_GetByteArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetByteArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetCharArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetCharArrayRegion {
+			get {
+				if (_GetCharArrayRegion == null)
+					_GetCharArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetCharArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetShortArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetShortArrayRegion {
+			get {
+				if (_GetShortArrayRegion == null)
+					_GetShortArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetShortArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetIntArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetIntArrayRegion {
+			get {
+				if (_GetIntArrayRegion == null)
+					_GetIntArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetIntArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetLongArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetLongArrayRegion {
+			get {
+				if (_GetLongArrayRegion == null)
+					_GetLongArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetLongArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetFloatArrayRegion {
+			get {
+				if (_GetFloatArrayRegion == null)
+					_GetFloatArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetFloatArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetDoubleArrayRegion {
+			get {
+				if (_GetDoubleArrayRegion == null)
+					_GetDoubleArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetDoubleArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetBooleanArrayRegion {
+			get {
+				if (_SetBooleanArrayRegion == null)
+					_SetBooleanArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetBooleanArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetByteArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetByteArrayRegion {
+			get {
+				if (_SetByteArrayRegion == null)
+					_SetByteArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetByteArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetCharArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetCharArrayRegion {
+			get {
+				if (_SetCharArrayRegion == null)
+					_SetCharArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetCharArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetShortArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetShortArrayRegion {
+			get {
+				if (_SetShortArrayRegion == null)
+					_SetShortArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetShortArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetIntArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetIntArrayRegion {
+			get {
+				if (_SetIntArrayRegion == null)
+					_SetIntArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetIntArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetLongArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetLongArrayRegion {
+			get {
+				if (_SetLongArrayRegion == null)
+					_SetLongArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetLongArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetFloatArrayRegion {
+			get {
+				if (_SetFloatArrayRegion == null)
+					_SetFloatArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetFloatArrayRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetDoubleArrayRegion {
+			get {
+				if (_SetDoubleArrayRegion == null)
+					_SetDoubleArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _SetDoubleArrayRegion;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
+		public JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int RegisterNatives {
+			get {
+				if (_RegisterNatives == null)
+					_RegisterNatives = (JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int));
+				return _RegisterNatives;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _UnregisterNatives;
+		public JniFunc_JNIEnvPtr_jobject_int UnregisterNatives {
+			get {
+				if (_UnregisterNatives == null)
+					_UnregisterNatives = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _UnregisterNatives;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _MonitorEnter;
+		public JniFunc_JNIEnvPtr_jobject_int MonitorEnter {
+			get {
+				if (_MonitorEnter == null)
+					_MonitorEnter = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _MonitorEnter;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_int _MonitorExit;
+		public JniFunc_JNIEnvPtr_jobject_int MonitorExit {
+			get {
+				if (_MonitorExit == null)
+					_MonitorExit = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JNIEnvPtr_jobject_int));
+				return _MonitorExit;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_outIntPtr_int _GetJavaVM;
+		public JniFunc_JNIEnvPtr_outIntPtr_int GetJavaVM {
+			get {
+				if (_GetJavaVM == null)
+					_GetJavaVM = (JniFunc_JNIEnvPtr_outIntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JNIEnvPtr_outIntPtr_int));
+				return _GetJavaVM;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetStringRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetStringRegion {
+			get {
+				if (_GetStringRegion == null)
+					_GetStringRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetStringRegion;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetStringUTFRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetStringUTFRegion {
+			get {
+				if (_GetStringUTFRegion == null)
+					_GetStringUTFRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
+				return _GetStringUTFRegion;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetPrimitiveArrayCritical;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetPrimitiveArrayCritical {
+			get {
+				if (_GetPrimitiveArrayCritical == null)
+					_GetPrimitiveArrayCritical = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
+				return _GetPrimitiveArrayCritical;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleasePrimitiveArrayCritical;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleasePrimitiveArrayCritical {
+			get {
+				if (_ReleasePrimitiveArrayCritical == null)
+					_ReleasePrimitiveArrayCritical = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
+				return _ReleasePrimitiveArrayCritical;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr_string _GetStringCritical;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_string GetStringCritical {
+			get {
+				if (_GetStringCritical == null)
+					_GetStringCritical = (JniFunc_JNIEnvPtr_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_string));
+				return _GetStringCritical;
+			}
+		}
+
+		JniAction_JNIEnvPtr_jobject_string _ReleaseStringCritical;
+		public JniAction_JNIEnvPtr_jobject_string ReleaseStringCritical {
+			get {
+				if (_ReleaseStringCritical == null)
+					_ReleaseStringCritical = (JniAction_JNIEnvPtr_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JNIEnvPtr_jobject_string));
+				return _ReleaseStringCritical;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_jobject _NewWeakGlobalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewWeakGlobalRef {
+			get {
+				if (_NewWeakGlobalRef == null)
+					_NewWeakGlobalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
+				return _NewWeakGlobalRef;
+			}
+		}
+
+		JniAction_JNIEnvPtr_IntPtr _DeleteWeakGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteWeakGlobalRef {
+			get {
+				if (_DeleteWeakGlobalRef == null)
+					_DeleteWeakGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
+				return _DeleteWeakGlobalRef;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_bool _ExceptionCheck;
+		public JniFunc_JNIEnvPtr_bool ExceptionCheck {
+			get {
+				if (_ExceptionCheck == null)
+					_ExceptionCheck = (JniFunc_JNIEnvPtr_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JNIEnvPtr_bool));
+				return _ExceptionCheck;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_IntPtr_long_jobject _NewDirectByteBuffer;
+		public JniFunc_JNIEnvPtr_IntPtr_long_jobject NewDirectByteBuffer {
+			get {
+				if (_NewDirectByteBuffer == null)
+					_NewDirectByteBuffer = (JniFunc_JNIEnvPtr_IntPtr_long_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JNIEnvPtr_IntPtr_long_jobject));
+				return _NewDirectByteBuffer;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_IntPtr _GetDirectBufferAddress;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr GetDirectBufferAddress {
+			get {
+				if (_GetDirectBufferAddress == null)
+					_GetDirectBufferAddress = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
+				return _GetDirectBufferAddress;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_long _GetDirectBufferCapacity;
+		public JniFunc_JNIEnvPtr_jobject_long GetDirectBufferCapacity {
+			get {
+				if (_GetDirectBufferCapacity == null)
+					_GetDirectBufferCapacity = (JniFunc_JNIEnvPtr_jobject_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JNIEnvPtr_jobject_long));
+				return _GetDirectBufferCapacity;
+			}
+		}
+
+		JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType _GetObjectRefType;
+		public JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType GetObjectRefType {
+			get {
+				if (_GetObjectRefType == null)
+					_GetObjectRefType = (JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType));
+				return _GetObjectRefType;
+			}
+		}
+	}
+}
+#endif  // FEATURE_HANDLES_ARE_INTPTRS
+#if FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX
+namespace
+#if _NAMESPACE_PER_HANDLE
+	Java.Interop.JIPinvokes
+#else
+	Java.Interop
+#endif
+{
+
+	unsafe delegate int JniFunc_JNIEnvPtr_int (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject (JNIEnvPtr env, string name, jobject loader, IntPtr buffer, int bufferLength);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject (JNIEnvPtr env, string classname);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject (JNIEnvPtr env, jobject klass, IntPtr method, bool isStatic);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject (JNIEnvPtr env, jobject klass);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_bool (JNIEnvPtr env, jobject class1, jobject class2);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_int (JNIEnvPtr env, jobject toThrow);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_string_int (JNIEnvPtr env, jobject klass, string message);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr_string (JNIEnvPtr env, string message);
+	unsafe delegate int JniFunc_JNIEnvPtr_int_int (JNIEnvPtr env, int capacity);
+	unsafe delegate void JniAction_JNIEnvPtr_IntPtr (JNIEnvPtr env, IntPtr @object);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_string_string_IntPtr (JNIEnvPtr env, jobject klass, string name, string signature);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, IntPtr field, jobject value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr field, bool value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr field, sbyte value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr field, char value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr field, short value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr field, int value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr field, long value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr field, float value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr field, double value);
+	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_int_jobject (JNIEnvPtr env, IntPtr unicodeChars, int length);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate string JniFunc_JNIEnvPtr_jobject_IntPtr_string (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_string (JNIEnvPtr env, jobject @string, string utf);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject_jobject_jobject (JNIEnvPtr env, int length, jobject elementClass, jobject initialElement);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index, jobject value);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject (JNIEnvPtr env, int length);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_int_IntPtr (JNIEnvPtr env, jobject array, int start, int length, IntPtr buffer);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, jobject klass, JniNativeMethodRegistration [] methods, int numMethods);
+	unsafe delegate int JniFunc_JNIEnvPtr_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
+	unsafe delegate bool JniFunc_JNIEnvPtr_bool (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_long_jobject (JNIEnvPtr env, IntPtr address, long capacity);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_long (JNIEnvPtr env, jobject buffer);
+	unsafe delegate JniObjectReferenceType JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType (JNIEnvPtr env, jobject @object);
+
+	partial class JniEnvironment {
+		const string JavaInteropLib = "JavaInterop";
+
+
+	internal static partial class Activator {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_AllocObject (IntPtr jnienv, out IntPtr thrown, jobject klass);
+
+		public static unsafe JniObjectReference AllocObject (JniObjectReference klass)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_AllocObject (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewObject (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_NewObject (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewObjectA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		public static unsafe JniObjectReference NewObject (JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_NewObjectA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+	}
+
+	public static partial class Arrays {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetArrayLength (IntPtr jnienv, jobject array_ptr);
+
+		public static unsafe int GetArrayLength (JniObjectReference array_ptr)
+		{
+			if (array_ptr.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array_ptr` must not be IntPtr.Zero.", "array_ptr");
+
+			var tmp = JavaInterop_GetArrayLength (JniEnvironment.Current.EnvironmentPointer, array_ptr.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewObjectArray (IntPtr jnienv, out IntPtr thrown, int length, jobject elementClass, jobject initialElement);
+
+		public static unsafe JniObjectReference NewObjectArray (int length, JniObjectReference elementClass, JniObjectReference initialElement)
+		{
+			if (elementClass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`elementClass` must not be IntPtr.Zero.", "elementClass");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_NewObjectArray (JniEnvironment.Current.EnvironmentPointer, out thrown, length, elementClass.Handle, initialElement.Handle);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_GetObjectArrayElement (IntPtr jnienv, out IntPtr thrown, jobject array, int index);
+
+		public static unsafe JniObjectReference GetObjectArrayElement (JniObjectReference array, int index)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_GetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, index);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetObjectArrayElement (IntPtr jnienv, out IntPtr thrown, jobject array, int index, jobject value);
+
+		public static unsafe void SetObjectArrayElement (JniObjectReference array, int index, JniObjectReference value)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			IntPtr thrown;
+			JavaInterop_SetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, index, value.Handle);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewBooleanArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewBooleanArray (int length)
+		{
+			var tmp = JavaInterop_NewBooleanArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewByteArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewByteArray (int length)
+		{
+			var tmp = JavaInterop_NewByteArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewCharArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewCharArray (int length)
+		{
+			var tmp = JavaInterop_NewCharArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewShortArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewShortArray (int length)
+		{
+			var tmp = JavaInterop_NewShortArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewIntArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewIntArray (int length)
+		{
+			var tmp = JavaInterop_NewIntArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewLongArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewLongArray (int length)
+		{
+			var tmp = JavaInterop_NewLongArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewFloatArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewFloatArray (int length)
+		{
+			var tmp = JavaInterop_NewFloatArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewDoubleArray (IntPtr jnienv, int length);
+
+		public static unsafe JniObjectReference NewDoubleArray (int length)
+		{
+			var tmp = JavaInterop_NewDoubleArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetBooleanArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetBooleanArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetByteArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetByteArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetCharArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetCharArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetShortArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetShortArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetIntArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetIntArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetLongArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetLongArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetFloatArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetFloatArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetDoubleArrayElements (IntPtr jnienv, jobject array, IntPtr isCopy);
+
+		public static unsafe IntPtr GetDoubleArrayElements (JniObjectReference array, IntPtr isCopy)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JavaInterop_GetDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseBooleanArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseBooleanArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseByteArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseByteArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseCharArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseCharArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseShortArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseShortArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseIntArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseIntArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseLongArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseLongArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseFloatArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseFloatArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseDoubleArrayElements (IntPtr jnienv, jobject array, IntPtr elements, int mode);
+
+		public static unsafe void ReleaseDoubleArrayElements (JniObjectReference array, IntPtr elements, int mode)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JavaInterop_ReleaseDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array.Handle, elements, mode);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetBooleanArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		internal static unsafe void GetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetByteArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetCharArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetShortArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetIntArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetLongArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetFloatArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_GetDoubleArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void GetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_GetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetBooleanArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		internal static unsafe void SetBooleanArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetByteArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetByteArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetCharArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetCharArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetShortArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetShortArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetIntArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetIntArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetLongArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetLongArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetFloatArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetFloatArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetDoubleArrayRegion (IntPtr jnienv, out IntPtr thrown, jobject array, int start, int length, IntPtr buffer);
+
+		public static unsafe void SetDoubleArrayRegion (JniObjectReference array, int start, int length, IntPtr buffer)
+		{
+			if (array.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			JavaInterop_SetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, out thrown, array.Handle, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+	}
+
+	public static partial class Exceptions {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_Throw (IntPtr jnienv, jobject toThrow);
+
+		public static unsafe int Throw (JniObjectReference toThrow)
+		{
+			if (toThrow.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`toThrow` must not be IntPtr.Zero.", "toThrow");
+
+			var tmp = JavaInterop_Throw (JniEnvironment.Current.EnvironmentPointer, toThrow.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_ThrowNew (IntPtr jnienv, jobject klass, string message);
+
+		public static unsafe int ThrowNew (JniObjectReference klass, string message)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (message == null)
+				throw new ArgumentNullException ("message");
+
+			var tmp = JavaInterop_ThrowNew (JniEnvironment.Current.EnvironmentPointer, klass.Handle, message);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_ExceptionOccurred (IntPtr jnienv);
+
+		internal static unsafe JniObjectReference ExceptionOccurred ()
+		{
+			var tmp = JavaInterop_ExceptionOccurred (JniEnvironment.Current.EnvironmentPointer);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ExceptionDescribe (IntPtr jnienv);
+
+		internal static unsafe void ExceptionDescribe ()
+		{
+			JavaInterop_ExceptionDescribe (JniEnvironment.Current.EnvironmentPointer);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ExceptionClear (IntPtr jnienv);
+
+		internal static unsafe void ExceptionClear ()
+		{
+			JavaInterop_ExceptionClear (JniEnvironment.Current.EnvironmentPointer);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_FatalError (IntPtr jnienv, string message);
+
+		public static unsafe void FatalError (string message)
+		{
+			if (message == null)
+				throw new ArgumentNullException ("message");
+
+			JavaInterop_FatalError (JniEnvironment.Current.EnvironmentPointer, message);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_ExceptionCheck (IntPtr jnienv);
+
+		internal static unsafe bool ExceptionCheck ()
+		{
+			var tmp = JavaInterop_ExceptionCheck (JniEnvironment.Current.EnvironmentPointer);
+			return tmp;
+		}
+	}
+
+	internal static partial class InstanceFields {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetFieldID (IntPtr jnienv, out IntPtr thrown, jobject klass, string name, string signature);
+
+		public static unsafe JniInstanceFieldInfo GetFieldID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_GetFieldID (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceFieldInfo (tmp);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_GetObjectField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe JniObjectReference GetObjectField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_GetBooleanField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe bool GetBooleanField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_GetByteField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe sbyte GetByteField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetByteField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_GetCharField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe char GetCharField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetCharField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_GetShortField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe short GetShortField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetShortField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetIntField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe int GetIntField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetIntField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_GetLongField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe long GetLongField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetLongField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_GetFloatField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe float GetFloatField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_GetDoubleField (IntPtr jnienv, jobject @object, IntPtr field);
+
+		internal static unsafe double GetDoubleField (JniObjectReference @object, JniInstanceFieldInfo field)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetObjectField (IntPtr jnienv, jobject @object, IntPtr field, jobject value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, JniObjectReference value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetObjectField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value.Handle);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetBooleanField (IntPtr jnienv, jobject @object, IntPtr field, bool value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, bool value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetByteField (IntPtr jnienv, jobject @object, IntPtr field, sbyte value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, sbyte value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetByteField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetCharField (IntPtr jnienv, jobject @object, IntPtr field, char value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, char value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetCharField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetShortField (IntPtr jnienv, jobject @object, IntPtr field, short value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, short value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetShortField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetIntField (IntPtr jnienv, jobject @object, IntPtr field, int value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, int value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetIntField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetLongField (IntPtr jnienv, jobject @object, IntPtr field, long value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, long value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetLongField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetFloatField (IntPtr jnienv, jobject @object, IntPtr field, float value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, float value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetFloatField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetDoubleField (IntPtr jnienv, jobject @object, IntPtr field, double value);
+
+		internal static unsafe void SetField (JniObjectReference @object, JniInstanceFieldInfo field, double value)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object.Handle, field.ID, value);
+		}
+	}
+
+	internal static partial class InstanceMethods {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetMethodID (IntPtr jnienv, out IntPtr thrown, jobject klass, string name, string signature);
+
+		internal static unsafe JniInstanceMethodInfo GetMethodID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_GetMethodID (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniInstanceMethodInfo (tmp);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallObjectMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallObjectMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallObjectMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe JniObjectReference CallObjectMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallObjectMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallBooleanMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallBooleanMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallBooleanMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe bool CallBooleanMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallByteMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallByteMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallByteMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe sbyte CallByteMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallByteMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallCharMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallCharMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallCharMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe char CallCharMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallCharMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallShortMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallShortMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallShortMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe short CallShortMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallShortMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallIntMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallIntMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallIntMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe int CallIntMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallIntMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallLongMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallLongMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallLongMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe long CallLongMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallLongMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallFloatMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallFloatMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallFloatMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe float CallFloatMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallFloatMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallDoubleMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallDoubleMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallDoubleMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe double CallDoubleMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallVoidMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method);
+
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallVoidMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallVoidMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, IntPtr method, JValue* args);
+
+		internal static unsafe void CallVoidMethod (JniObjectReference @object, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallVoidMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallNonvirtualObjectMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualObjectMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallNonvirtualObjectMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe JniObjectReference CallNonvirtualObjectMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualObjectMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallNonvirtualBooleanMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualBooleanMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallNonvirtualBooleanMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe bool CallNonvirtualBooleanMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallNonvirtualByteMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualByteMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallNonvirtualByteMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe sbyte CallNonvirtualByteMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualByteMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallNonvirtualCharMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualCharMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallNonvirtualCharMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe char CallNonvirtualCharMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualCharMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallNonvirtualShortMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualShortMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallNonvirtualShortMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe short CallNonvirtualShortMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualShortMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallNonvirtualIntMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualIntMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallNonvirtualIntMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe int CallNonvirtualIntMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualIntMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallNonvirtualLongMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualLongMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallNonvirtualLongMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe long CallNonvirtualLongMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualLongMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallNonvirtualFloatMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualFloatMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallNonvirtualFloatMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe float CallNonvirtualFloatMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualFloatMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallNonvirtualDoubleMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualDoubleMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallNonvirtualDoubleMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe double CallNonvirtualDoubleMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallNonvirtualDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallNonvirtualVoidMethod (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method);
+
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallNonvirtualVoidMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallNonvirtualVoidMethodA (IntPtr jnienv, out IntPtr thrown, jobject @object, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe void CallNonvirtualVoidMethod (JniObjectReference @object, JniObjectReference klass, JniInstanceMethodInfo method, JValue* args)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallNonvirtualVoidMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, @object.Handle, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+	}
+
+	public static partial class IO {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewDirectByteBuffer (IntPtr jnienv, out IntPtr thrown, IntPtr address, long capacity);
+
+		public static unsafe JniObjectReference NewDirectByteBuffer (IntPtr address, long capacity)
+		{
+			if (address == IntPtr.Zero)
+				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_NewDirectByteBuffer (JniEnvironment.Current.EnvironmentPointer, out thrown, address, capacity);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetDirectBufferAddress (IntPtr jnienv, jobject buffer);
+
+		public static unsafe IntPtr GetDirectBufferAddress (JniObjectReference buffer)
+		{
+			if (buffer.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
+
+			var tmp = JavaInterop_GetDirectBufferAddress (JniEnvironment.Current.EnvironmentPointer, buffer.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_GetDirectBufferCapacity (IntPtr jnienv, jobject buffer);
+
+		public static unsafe long GetDirectBufferCapacity (JniObjectReference buffer)
+		{
+			if (buffer.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
+
+			var tmp = JavaInterop_GetDirectBufferCapacity (JniEnvironment.Current.EnvironmentPointer, buffer.Handle);
+			return tmp;
+		}
+	}
+
+	internal static partial class Monitors {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_MonitorEnter (IntPtr jnienv, jobject @object);
+
+		public static unsafe int MonitorEnter (JniObjectReference @object)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JavaInterop_MonitorEnter (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_MonitorExit (IntPtr jnienv, jobject @object);
+
+		public static unsafe int MonitorExit (JniObjectReference @object)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JavaInterop_MonitorExit (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return tmp;
+		}
+	}
+
+	public static partial class References {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_PushLocalFrame (IntPtr jnienv, int capacity);
+
+		public static unsafe int PushLocalFrame (int capacity)
+		{
+			var tmp = JavaInterop_PushLocalFrame (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_PopLocalFrame (IntPtr jnienv, jobject result);
+
+		public static unsafe JniObjectReference PopLocalFrame (JniObjectReference result)
+		{
+			var tmp = JavaInterop_PopLocalFrame (JniEnvironment.Current.EnvironmentPointer, result.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewGlobalRef (IntPtr jnienv, jobject @object);
+
+		internal static unsafe JniObjectReference NewGlobalRef (JniObjectReference @object)
+		{
+			var tmp = JavaInterop_NewGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Global);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_DeleteGlobalRef (IntPtr jnienv, IntPtr @object);
+
+		internal static unsafe void DeleteGlobalRef (IntPtr @object)
+		{
+			JavaInterop_DeleteGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_DeleteLocalRef (IntPtr jnienv, IntPtr @object);
+
+		internal static unsafe void DeleteLocalRef (IntPtr @object)
+		{
+			JavaInterop_DeleteLocalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewLocalRef (IntPtr jnienv, jobject @object);
+
+		internal static unsafe JniObjectReference NewLocalRef (JniObjectReference @object)
+		{
+			var tmp = JavaInterop_NewLocalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_EnsureLocalCapacity (IntPtr jnienv, int capacity);
+
+		public static unsafe int EnsureLocalCapacity (int capacity)
+		{
+			var tmp = JavaInterop_EnsureLocalCapacity (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetJavaVM (IntPtr jnienv, out IntPtr vm);
+
+		public static unsafe int GetJavaVM (out IntPtr vm)
+		{
+			var tmp = JavaInterop_GetJavaVM (JniEnvironment.Current.EnvironmentPointer, out vm);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewWeakGlobalRef (IntPtr jnienv, jobject @object);
+
+		internal static unsafe JniObjectReference NewWeakGlobalRef (JniObjectReference @object)
+		{
+			var tmp = JavaInterop_NewWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return new JniObjectReference (tmp, JniObjectReferenceType.WeakGlobal);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_DeleteWeakGlobalRef (IntPtr jnienv, IntPtr @object);
+
+		internal static unsafe void DeleteWeakGlobalRef (IntPtr @object)
+		{
+			JavaInterop_DeleteWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe JniObjectReferenceType JavaInterop_GetObjectRefType (IntPtr jnienv, jobject @object);
+
+		internal static unsafe JniObjectReferenceType GetObjectRefType (JniObjectReference @object)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JavaInterop_GetObjectRefType (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			return tmp;
+		}
+	}
+
+	internal static partial class Reflection {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_ToReflectedMethod (IntPtr jnienv, jobject klass, IntPtr method, bool isStatic);
+
+		internal static unsafe JniObjectReference ToReflectedMethod (JniObjectReference klass, JniInstanceMethodInfo method, bool isStatic)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JavaInterop_ToReflectedMethod (JniEnvironment.Current.EnvironmentPointer, klass.Handle, method.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_ToReflectedField (IntPtr jnienv, jobject klass, IntPtr field, bool isStatic);
+
+		internal static unsafe JniObjectReference ToReflectedField (JniObjectReference klass, JniInstanceFieldInfo field, bool isStatic)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_ToReflectedField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+	}
+
+	internal static partial class StaticFields {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetStaticFieldID (IntPtr jnienv, out IntPtr thrown, jobject klass, string name, string signature);
+
+		public static unsafe JniStaticFieldInfo GetStaticFieldID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_GetStaticFieldID (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticFieldInfo (tmp);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_GetStaticObjectField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe JniObjectReference GetStaticObjectField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_GetStaticBooleanField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe bool GetStaticBooleanField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_GetStaticByteField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe sbyte GetStaticByteField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_GetStaticCharField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe char GetStaticCharField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_GetStaticShortField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe short GetStaticShortField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetStaticIntField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe int GetStaticIntField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_GetStaticLongField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe long GetStaticLongField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_GetStaticFloatField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe float GetStaticFloatField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_GetStaticDoubleField (IntPtr jnienv, jobject klass, IntPtr field);
+
+		internal static unsafe double GetStaticDoubleField (JniObjectReference klass, JniStaticFieldInfo field)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JavaInterop_GetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticObjectField (IntPtr jnienv, jobject klass, IntPtr field, jobject value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, JniObjectReference value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value.Handle);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticBooleanField (IntPtr jnienv, jobject klass, IntPtr field, bool value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, bool value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticByteField (IntPtr jnienv, jobject klass, IntPtr field, sbyte value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, sbyte value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticCharField (IntPtr jnienv, jobject klass, IntPtr field, char value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, char value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticShortField (IntPtr jnienv, jobject klass, IntPtr field, short value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, short value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticIntField (IntPtr jnienv, jobject klass, IntPtr field, int value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, int value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticLongField (IntPtr jnienv, jobject klass, IntPtr field, long value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, long value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticFloatField (IntPtr jnienv, jobject klass, IntPtr field, float value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, float value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_SetStaticDoubleField (IntPtr jnienv, jobject klass, IntPtr field, double value);
+
+		internal static unsafe void SetStaticField (JniObjectReference klass, JniStaticFieldInfo field, double value)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (field.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JavaInterop_SetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass.Handle, field.ID, value);
+		}
+	}
+
+	internal static partial class StaticMethods {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetStaticMethodID (IntPtr jnienv, out IntPtr thrown, jobject klass, string name, string signature);
+
+		public static unsafe JniStaticMethodInfo GetStaticMethodID (JniObjectReference klass, string name, string signature)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_GetStaticMethodID (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			if (tmp == IntPtr.Zero)
+				return null;
+			return new JniStaticMethodInfo (tmp);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallStaticObjectMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticObjectMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_CallStaticObjectMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe JniObjectReference CallStaticObjectMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticObjectMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallStaticBooleanMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticBooleanMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_CallStaticBooleanMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallStaticByteMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticByteMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe sbyte JavaInterop_CallStaticByteMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe sbyte CallStaticByteMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticByteMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallStaticCharMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticCharMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe char JavaInterop_CallStaticCharMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe char CallStaticCharMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticCharMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallStaticShortMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticShortMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe short JavaInterop_CallStaticShortMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe short CallStaticShortMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticShortMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallStaticIntMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticIntMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_CallStaticIntMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe int CallStaticIntMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticIntMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallStaticLongMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticLongMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe long JavaInterop_CallStaticLongMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe long CallStaticLongMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticLongMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallStaticFloatMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticFloatMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe float JavaInterop_CallStaticFloatMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe float CallStaticFloatMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticFloatMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallStaticDoubleMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticDoubleMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe double JavaInterop_CallStaticDoubleMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe double CallStaticDoubleMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_CallStaticDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallStaticVoidMethod (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method);
+
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallStaticVoidMethod (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_CallStaticVoidMethodA (IntPtr jnienv, out IntPtr thrown, jobject klass, IntPtr method, JValue* args);
+
+		internal static unsafe void CallStaticVoidMethod (JniObjectReference klass, JniStaticMethodInfo method, JValue* args)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (method.ID == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			IntPtr thrown;
+			JavaInterop_CallStaticVoidMethodA (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, method.ID, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+		}
+	}
+
+	public static partial class Strings {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_NewString (IntPtr jnienv, out IntPtr thrown, IntPtr unicodeChars, int length);
+
+		internal static unsafe JniObjectReference NewString (IntPtr unicodeChars, int length)
+		{
+			if (unicodeChars == IntPtr.Zero)
+				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_NewString (JniEnvironment.Current.EnvironmentPointer, out thrown, unicodeChars, length);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetStringLength (IntPtr jnienv, jobject @string);
+
+		internal static unsafe int GetStringLength (JniObjectReference @string)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+
+			var tmp = JavaInterop_GetStringLength (JniEnvironment.Current.EnvironmentPointer, @string.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe IntPtr JavaInterop_GetStringChars (IntPtr jnienv, jobject @string, IntPtr isCopy);
+
+		internal static unsafe IntPtr GetStringChars (JniObjectReference @string, IntPtr isCopy)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+
+			var tmp = JavaInterop_GetStringChars (JniEnvironment.Current.EnvironmentPointer, @string.Handle, isCopy);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe void JavaInterop_ReleaseStringChars (IntPtr jnienv, jobject @string, IntPtr chars);
+
+		internal static unsafe void ReleaseStringChars (JniObjectReference @string, IntPtr chars)
+		{
+			if (@string.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
+			if (chars == IntPtr.Zero)
+				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
+
+			JavaInterop_ReleaseStringChars (JniEnvironment.Current.EnvironmentPointer, @string.Handle, chars);
+		}
+	}
+
+	public static partial class Types {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_DefineClass (IntPtr jnienv, out IntPtr thrown, string name, jobject loader, IntPtr buffer, int bufferLength);
+
+		internal static unsafe JniObjectReference DefineClass (string name, JniObjectReference loader, IntPtr buffer, int bufferLength)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (loader.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`loader` must not be IntPtr.Zero.", "loader");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_DefineClass (JniEnvironment.Current.EnvironmentPointer, out thrown, name, loader.Handle, buffer, bufferLength);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_FindClass (IntPtr jnienv, out IntPtr thrown, string classname);
+
+		public static unsafe JniObjectReference FindClass (string classname)
+		{
+			if (classname == null)
+				throw new ArgumentNullException ("classname");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_FindClass (JniEnvironment.Current.EnvironmentPointer, out thrown, classname);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_GetSuperclass (IntPtr jnienv, jobject klass);
+
+		public static unsafe JniObjectReference GetSuperclass (JniObjectReference klass)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JavaInterop_GetSuperclass (JniEnvironment.Current.EnvironmentPointer, klass.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_IsAssignableFrom (IntPtr jnienv, jobject class1, jobject class2);
+
+		public static unsafe bool IsAssignableFrom (JniObjectReference class1, JniObjectReference class2)
+		{
+			if (class1.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`class1` must not be IntPtr.Zero.", "class1");
+			if (class2.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`class2` must not be IntPtr.Zero.", "class2");
+
+			var tmp = JavaInterop_IsAssignableFrom (JniEnvironment.Current.EnvironmentPointer, class1.Handle, class2.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_IsSameObject (IntPtr jnienv, jobject object1, jobject object2);
+
+		public static unsafe bool IsSameObject (JniObjectReference object1, JniObjectReference object2)
+		{
+			var tmp = JavaInterop_IsSameObject (JniEnvironment.Current.EnvironmentPointer, object1.Handle, object2.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe jobject JavaInterop_GetObjectClass (IntPtr jnienv, jobject @object);
+
+		public static unsafe JniObjectReference GetObjectClass (JniObjectReference @object)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JavaInterop_GetObjectClass (JniEnvironment.Current.EnvironmentPointer, @object.Handle);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe bool JavaInterop_IsInstanceOf (IntPtr jnienv, jobject @object, jobject klass);
+
+		public static unsafe bool IsInstanceOf (JniObjectReference @object, JniObjectReference klass)
+		{
+			if (@object.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JavaInterop_IsInstanceOf (JniEnvironment.Current.EnvironmentPointer, @object.Handle, klass.Handle);
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_RegisterNatives (IntPtr jnienv, out IntPtr thrown, jobject klass, JniNativeMethodRegistration [] methods, int numMethods);
+
+		internal static unsafe int RegisterNatives (JniObjectReference klass, JniNativeMethodRegistration [] methods, int numMethods)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			IntPtr thrown;
+			var tmp = JavaInterop_RegisterNatives (JniEnvironment.Current.EnvironmentPointer, out thrown, klass.Handle, methods, numMethods);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable (thrown);
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_UnregisterNatives (IntPtr jnienv, jobject klass);
+
+		internal static unsafe int UnregisterNatives (JniObjectReference klass)
+		{
+			if (klass.Handle == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JavaInterop_UnregisterNatives (JniEnvironment.Current.EnvironmentPointer, klass.Handle);
+			return tmp;
+		}
+	}
+
+	internal static partial class Versions {
+
+		[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]
+		static extern unsafe int JavaInterop_GetVersion (IntPtr jnienv);
+
+		internal static unsafe int GetVersion ()
+		{
+			var tmp = JavaInterop_GetVersion (JniEnvironment.Current.EnvironmentPointer);
+			return tmp;
+		}
+	}
+	}
+
+}
+#endif  // FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX
+#if FEATURE_HANDLES_ARE_XA_INTPTRS
+namespace
+#if _NAMESPACE_PER_HANDLE
+	Java.Interop.XAIntPtrs
+#else
+	Java.Interop
+#endif
+{
+
+	unsafe delegate int JniFunc_JNIEnvPtr_int (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject (JNIEnvPtr env, string name, jobject loader, IntPtr buffer, int bufferLength);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_string_jobject (JNIEnvPtr env, string classname);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject (JNIEnvPtr env, jobject klass, IntPtr method, bool isStatic);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject (JNIEnvPtr env, jobject klass);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_bool (JNIEnvPtr env, jobject class1, jobject class2);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_int (JNIEnvPtr env, jobject toThrow);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_string_int (JNIEnvPtr env, jobject klass, string message);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr (JNIEnvPtr env);
+	unsafe delegate void JniAction_JNIEnvPtr_string (JNIEnvPtr env, string message);
+	unsafe delegate int JniFunc_JNIEnvPtr_int_int (JNIEnvPtr env, int capacity);
+	unsafe delegate void JniAction_JNIEnvPtr_IntPtr (JNIEnvPtr env, IntPtr @object);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_string_string_IntPtr (JNIEnvPtr env, jobject klass, string name, string signature);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr (JNIEnvPtr env, jobject @object, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, IntPtr method, JValue* args);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate bool JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate sbyte JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate char JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate short JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate float JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate double JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef (JNIEnvPtr env, jobject @object, jobject klass, IntPtr method, JValue* args);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_jobject (JNIEnvPtr env, jobject @object, IntPtr field, jobject value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_bool (JNIEnvPtr env, jobject @object, IntPtr field, bool value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_sbyte (JNIEnvPtr env, jobject @object, IntPtr field, sbyte value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_char (JNIEnvPtr env, jobject @object, IntPtr field, char value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_short (JNIEnvPtr env, jobject @object, IntPtr field, short value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_int (JNIEnvPtr env, jobject @object, IntPtr field, int value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_long (JNIEnvPtr env, jobject @object, IntPtr field, long value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_float (JNIEnvPtr env, jobject @object, IntPtr field, float value);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_IntPtr_double (JNIEnvPtr env, jobject @object, IntPtr field, double value);
+	[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_int_jobject (JNIEnvPtr env, IntPtr unicodeChars, int length);
+	unsafe delegate IntPtr JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate string JniFunc_JNIEnvPtr_jobject_IntPtr_string (JNIEnvPtr env, jobject @string, IntPtr isCopy);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_string (JNIEnvPtr env, jobject @string, string utf);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject_jobject_jobject (JNIEnvPtr env, int length, jobject elementClass, jobject initialElement);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_jobject (JNIEnvPtr env, jobject array, int index, jobject value);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_int_jobject (JNIEnvPtr env, int length);
+	unsafe delegate void JniAction_JNIEnvPtr_jobject_int_int_IntPtr (JNIEnvPtr env, jobject array, int start, int length, IntPtr buffer);
+	unsafe delegate int JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int (JNIEnvPtr env, jobject klass, JniNativeMethodRegistration [] methods, int numMethods);
+	unsafe delegate int JniFunc_JNIEnvPtr_outIntPtr_int (JNIEnvPtr env, out IntPtr vm);
+	unsafe delegate bool JniFunc_JNIEnvPtr_bool (JNIEnvPtr env);
+	unsafe delegate jobject JniFunc_JNIEnvPtr_IntPtr_long_jobject (JNIEnvPtr env, IntPtr address, long capacity);
+	unsafe delegate long JniFunc_JNIEnvPtr_jobject_long (JNIEnvPtr env, jobject buffer);
+	unsafe delegate JniObjectReferenceType JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType (JNIEnvPtr env, jobject @object);
+
+	partial class JniEnvironment {
+
+	internal static partial class Activator {
+
+		public static unsafe IntPtr AllocObject (IntPtr klass)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+
+			var tmp = JniEnvironment.Current.Invoker.AllocObject (JniEnvironment.Current.EnvironmentPointer, klass);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewObject (IntPtr klass, IntPtr method)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.NewObject (JniEnvironment.Current.EnvironmentPointer, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewObject (IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.NewObjectA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+	}
+
+	public static partial class Arrays {
+
+		public static unsafe int GetArrayLength (IntPtr array_ptr)
+		{
+			if (array_ptr == IntPtr.Zero)
+				throw new ArgumentException ("`array_ptr` must not be IntPtr.Zero.", "array_ptr");
+
+			var tmp = JniEnvironment.Current.Invoker.GetArrayLength (JniEnvironment.Current.EnvironmentPointer, array_ptr);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewObjectArray (int length, IntPtr elementClass, IntPtr initialElement)
+		{
+			if (elementClass == IntPtr.Zero)
+				throw new ArgumentException ("`elementClass` must not be IntPtr.Zero.", "elementClass");
+
+			var tmp = JniEnvironment.Current.Invoker.NewObjectArray (JniEnvironment.Current.EnvironmentPointer, length, elementClass, initialElement);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetObjectArrayElement (IntPtr array, int index)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array, index);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe void SetObjectArrayElement (IntPtr array, int index, IntPtr value)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			JniEnvironment.Current.Invoker.SetObjectArrayElement (JniEnvironment.Current.EnvironmentPointer, array, index, value);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe IntPtr NewBooleanArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewBooleanArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewByteArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewByteArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewCharArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewCharArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewShortArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewShortArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewIntArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewIntArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewLongArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewLongArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewFloatArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewFloatArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr NewDoubleArray (int length)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewDoubleArray (JniEnvironment.Current.EnvironmentPointer, length);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetBooleanArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetByteArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetCharArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetShortArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetIntArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetLongArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetFloatArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe IntPtr GetDoubleArrayElements (IntPtr array, IntPtr isCopy)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array, isCopy);
+			return tmp;
+		}
+
+		public static unsafe void ReleaseBooleanArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseBooleanArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseByteArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseByteArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseCharArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseCharArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseShortArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseShortArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseIntArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseIntArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseLongArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseLongArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseFloatArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseFloatArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		public static unsafe void ReleaseDoubleArrayElements (IntPtr array, IntPtr elements, int mode)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (elements == IntPtr.Zero)
+				throw new ArgumentException ("'elements' must not be IntPtr.Zero.", "elements");
+
+			JniEnvironment.Current.Invoker.ReleaseDoubleArrayElements (JniEnvironment.Current.EnvironmentPointer, array, elements, mode);
+		}
+
+		internal static unsafe void GetBooleanArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetByteArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetCharArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetShortArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetIntArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetLongArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetFloatArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void GetDoubleArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.GetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		internal static unsafe void SetBooleanArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetBooleanArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetByteArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetByteArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetCharArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetCharArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetShortArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetShortArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetIntArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetIntArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetLongArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetLongArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetFloatArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetFloatArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		public static unsafe void SetDoubleArrayRegion (IntPtr array, int start, int length, IntPtr buffer)
+		{
+			if (array == IntPtr.Zero)
+				throw new ArgumentException ("`array` must not be IntPtr.Zero.", "array");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
+
+			JniEnvironment.Current.Invoker.SetDoubleArrayRegion (JniEnvironment.Current.EnvironmentPointer, array, start, length, buffer);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+	}
+
+	public static partial class Exceptions {
+
+		public static unsafe int Throw (IntPtr toThrow)
+		{
+			if (toThrow == IntPtr.Zero)
+				throw new ArgumentException ("`toThrow` must not be IntPtr.Zero.", "toThrow");
+
+			var tmp = JniEnvironment.Current.Invoker.Throw (JniEnvironment.Current.EnvironmentPointer, toThrow);
+			return tmp;
+		}
+
+		public static unsafe int ThrowNew (IntPtr klass, string message)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (message == null)
+				throw new ArgumentNullException ("message");
+
+			var tmp = JniEnvironment.Current.Invoker.ThrowNew (JniEnvironment.Current.EnvironmentPointer, klass, message);
+			return tmp;
+		}
+
+		internal static unsafe IntPtr ExceptionOccurred ()
+		{
+			var tmp = JniEnvironment.Current.Invoker.ExceptionOccurred (JniEnvironment.Current.EnvironmentPointer);
+			return tmp;
+		}
+
+		internal static unsafe void ExceptionDescribe ()
+		{
+			JniEnvironment.Current.Invoker.ExceptionDescribe (JniEnvironment.Current.EnvironmentPointer);
+		}
+
+		internal static unsafe void ExceptionClear ()
+		{
+			JniEnvironment.Current.Invoker.ExceptionClear (JniEnvironment.Current.EnvironmentPointer);
+		}
+
+		public static unsafe void FatalError (string message)
+		{
+			if (message == null)
+				throw new ArgumentNullException ("message");
+
+			JniEnvironment.Current.Invoker.FatalError (JniEnvironment.Current.EnvironmentPointer, message);
+		}
+
+		internal static unsafe bool ExceptionCheck ()
+		{
+			var tmp = JniEnvironment.Current.Invoker.ExceptionCheck (JniEnvironment.Current.EnvironmentPointer);
+			return tmp;
+		}
+	}
+
+	internal static partial class InstanceFields {
+
+		public static unsafe IntPtr GetFieldID (IntPtr klass, string name, string signature)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFieldID (JniEnvironment.Current.EnvironmentPointer, klass, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe IntPtr GetObjectField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetObjectField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		internal static unsafe bool GetBooleanField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe sbyte GetByteField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetByteField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe char GetCharField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetCharField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe short GetShortField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetShortField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe int GetIntField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetIntField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe long GetLongField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetLongField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe float GetFloatField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetFloatField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe double GetDoubleField (IntPtr @object, IntPtr field)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object, field);
+			return tmp;
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, IntPtr value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetObjectField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, bool value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetBooleanField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, sbyte value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetByteField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, char value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetCharField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, short value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetShortField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, int value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetIntField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, long value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetLongField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, float value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetFloatField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+
+		internal static unsafe void SetField (IntPtr @object, IntPtr field, double value)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetDoubleField (JniEnvironment.Current.EnvironmentPointer, @object, field, value);
+		}
+	}
+
+	internal static partial class InstanceMethods {
+
+		internal static unsafe IntPtr GetMethodID (IntPtr klass, string name, string signature)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
+
+			var tmp = JniEnvironment.Current.Invoker.GetMethodID (JniEnvironment.Current.EnvironmentPointer, klass, name, signature);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe IntPtr CallObjectMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		internal static unsafe IntPtr CallObjectMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		internal static unsafe bool CallBooleanMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe bool CallBooleanMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallByteMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallByteMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallCharMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallCharMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallShortMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallShortMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallIntMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallIntMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallLongMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallLongMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallFloatMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallFloatMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallDoubleMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallDoubleMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe void CallVoidMethod (IntPtr @object, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		internal static unsafe void CallVoidMethod (IntPtr @object, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		internal static unsafe IntPtr CallNonvirtualObjectMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		internal static unsafe IntPtr CallNonvirtualObjectMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualObjectMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
+
+		internal static unsafe bool CallNonvirtualBooleanMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe bool CallNonvirtualBooleanMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallNonvirtualByteMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe sbyte CallNonvirtualByteMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualByteMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallNonvirtualCharMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe char CallNonvirtualCharMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualCharMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallNonvirtualShortMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe short CallNonvirtualShortMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualShortMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallNonvirtualIntMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe int CallNonvirtualIntMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualIntMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallNonvirtualLongMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe long CallNonvirtualLongMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualLongMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallNonvirtualFloatMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe float CallNonvirtualFloatMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualFloatMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallNonvirtualDoubleMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe double CallNonvirtualDoubleMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallNonvirtualDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+			return tmp;
+		}
+
+		internal static unsafe void CallNonvirtualVoidMethod (IntPtr @object, IntPtr klass, IntPtr method)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethod (JniEnvironment.Current.EnvironmentPointer, @object, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
+
+		}
+
+		internal static unsafe void CallNonvirtualVoidMethod (IntPtr @object, IntPtr klass, IntPtr method, JValue* args)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallNonvirtualVoidMethodA (JniEnvironment.Current.EnvironmentPointer, @object, klass, method, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
-			return tmp;
 		}
+	}
+
+	public static partial class IO {
 
-		internal static unsafe bool CallStaticBooleanMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		public static unsafe IntPtr NewDirectByteBuffer (IntPtr address, long capacity)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (address == IntPtr.Zero)
+				throw new ArgumentException ("'address' must not be IntPtr.Zero.", "address");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.NewDirectByteBuffer (JniEnvironment.Current.EnvironmentPointer, address, capacity);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallStaticSByteMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		public static unsafe IntPtr GetDirectBufferAddress (IntPtr buffer)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferAddress (JniEnvironment.Current.EnvironmentPointer, buffer);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		public static unsafe long GetDirectBufferCapacity (IntPtr buffer)
+		{
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("`buffer` must not be IntPtr.Zero.", "buffer");
+
+			var tmp = JniEnvironment.Current.Invoker.GetDirectBufferCapacity (JniEnvironment.Current.EnvironmentPointer, buffer);
+			return tmp;
+		}
+	}
+
+	internal static partial class Monitors {
 
+		public static unsafe int MonitorEnter (IntPtr @object)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.EnvironmentPointer, @object);
 			return tmp;
 		}
 
-		internal static unsafe sbyte CallStaticSByteMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		public static unsafe int MonitorExit (IntPtr @object)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+
+			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.EnvironmentPointer, @object);
+			return tmp;
+		}
+	}
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticSByteMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+	public static partial class References {
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		public static unsafe int PushLocalFrame (int capacity)
+		{
+			var tmp = JniEnvironment.Current.Invoker.PushLocalFrame (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
 
+		public static unsafe IntPtr PopLocalFrame (IntPtr result)
+		{
+			var tmp = JniEnvironment.Current.Invoker.PopLocalFrame (JniEnvironment.Current.EnvironmentPointer, result);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return tmp;
 		}
 
-		internal static unsafe char CallStaticCharMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe IntPtr NewGlobalRef (IntPtr @object)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			var tmp = JniEnvironment.Current.Invoker.NewGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+			return tmp;
+		}
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+		internal static unsafe void DeleteGlobalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe void DeleteLocalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteLocalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
+
+		internal static unsafe IntPtr NewLocalRef (IntPtr @object)
+		{
+			var tmp = JniEnvironment.Current.Invoker.NewLocalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+			return tmp;
+		}
 
+		public static unsafe int EnsureLocalCapacity (int capacity)
+		{
+			var tmp = JniEnvironment.Current.Invoker.EnsureLocalCapacity (JniEnvironment.Current.EnvironmentPointer, capacity);
+			return tmp;
+		}
+
+		public static unsafe int GetJavaVM (out IntPtr vm)
+		{
+			var tmp = JniEnvironment.Current.Invoker.GetJavaVM (JniEnvironment.Current.EnvironmentPointer, out vm);
 			return tmp;
 		}
 
-		internal static unsafe char CallStaticCharMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe IntPtr NewWeakGlobalRef (IntPtr @object)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			var tmp = JniEnvironment.Current.Invoker.NewWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+			return tmp;
+		}
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+		internal static unsafe void DeleteWeakGlobalRef (IntPtr @object)
+		{
+			JniEnvironment.Current.Invoker.DeleteWeakGlobalRef (JniEnvironment.Current.EnvironmentPointer, @object);
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe JniObjectReferenceType GetObjectRefType (IntPtr @object)
+		{
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
 
+			var tmp = JniEnvironment.Current.Invoker.GetObjectRefType (JniEnvironment.Current.EnvironmentPointer, @object);
 			return tmp;
 		}
+	}
 
-		internal static unsafe short CallStaticShortMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+	internal static partial class Reflection {
+
+		internal static unsafe IntPtr ToReflectedMethod (IntPtr klass, IntPtr method, bool isStatic)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedMethod (JniEnvironment.Current.EnvironmentPointer, klass, method, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe IntPtr ToReflectedField (IntPtr klass, IntPtr field, bool isStatic)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.ToReflectedField (JniEnvironment.Current.EnvironmentPointer, klass, field, isStatic);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return tmp;
 		}
+	}
 
-		internal static unsafe short CallStaticShortMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+	internal static partial class StaticFields {
+
+		public static unsafe IntPtr GetStaticFieldID (IntPtr klass, string name, string signature)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.EnvironmentPointer, klass, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -7123,78 +14735,209 @@ internal static unsafe short CallStaticShortMethod (JniObjectReference jclass, j
 			return tmp;
 		}
 
-		internal static unsafe int CallStaticIntMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe IntPtr GetStaticObjectField (IntPtr klass, IntPtr field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass, field);
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe bool GetStaticBooleanField (IntPtr klass, IntPtr field)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass, field);
 			return tmp;
 		}
 
-		internal static unsafe int CallStaticIntMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte GetStaticByteField (IntPtr klass, IntPtr field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass, field);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe char GetStaticCharField (IntPtr klass, IntPtr field)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass, field);
 			return tmp;
 		}
 
-		internal static unsafe long CallStaticLongMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe short GetStaticShortField (IntPtr klass, IntPtr field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass, field);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe int GetStaticIntField (IntPtr klass, IntPtr field)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass, field);
 			return tmp;
 		}
 
-		internal static unsafe long CallStaticLongMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe long GetStaticLongField (IntPtr klass, IntPtr field)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass, field);
+			return tmp;
+		}
 
-			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
-			if (__e != null)
-				throw __e;
+		internal static unsafe float GetStaticFloatField (IntPtr klass, IntPtr field)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
 
+			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass, field);
 			return tmp;
 		}
 
-		internal static unsafe float CallStaticFloatMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe double GetStaticDoubleField (IntPtr klass, IntPtr field)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass, field);
+			return tmp;
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, IntPtr value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, bool value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, sbyte value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, char value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, short value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, int value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, long value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, float value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+
+		internal static unsafe void SetStaticField (IntPtr klass, IntPtr field, double value)
+		{
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (field == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "field");
+
+			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.EnvironmentPointer, klass, field, value);
+		}
+	}
+
+	internal static partial class StaticMethods {
+
+		public static unsafe IntPtr GetStaticMethodID (IntPtr klass, string name, string signature)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (signature == null)
+				throw new ArgumentNullException ("signature");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.GetStaticMethodID (JniEnvironment.Current.EnvironmentPointer, klass, name, signature);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -7203,46 +14946,48 @@ internal static unsafe float CallStaticFloatMethod (JniObjectReference jclass, j
 			return tmp;
 		}
 
-		internal static unsafe float CallStaticFloatMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe IntPtr CallStaticObjectMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return tmp;
 		}
 
-		internal static unsafe double CallStaticDoubleMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe IntPtr CallStaticObjectMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticObjectMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			JniEnvironment.Current.LogCreateLocalRef (tmp);
 			return tmp;
 		}
 
-		internal static unsafe double CallStaticDoubleMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe bool CallStaticBooleanMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -7251,46 +14996,46 @@ internal static unsafe double CallStaticDoubleMethod (JniObjectReference jclass,
 			return tmp;
 		}
 
-		internal static unsafe void CallStaticVoidMethod (JniObjectReference jclass, jstaticMethodID jmethod)
+		internal static unsafe bool CallStaticBooleanMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticBooleanMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			return tmp;
 		}
 
-		internal static unsafe void CallStaticVoidMethod (JniObjectReference jclass, jstaticMethodID jmethod, JValue* parms)
+		internal static unsafe sbyte CallStaticByteMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jmethod == IntPtr.Zero)
-				throw new ArgumentNullException ("jmethod");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.SafeHandle, jclass.Handle, jmethod, parms);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
+			return tmp;
 		}
 
-		public static unsafe jstaticFieldID GetStaticFieldID (JniObjectReference jclass, string name, string sig)
+		internal static unsafe sbyte CallStaticByteMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (sig == null)
-				throw new ArgumentNullException ("sig");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFieldID (JniEnvironment.Current.SafeHandle, jclass.Handle, name, sig);
+			var tmp = JniEnvironment.Current.Invoker.CallStaticByteMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -7299,354 +15044,365 @@ public static unsafe jstaticFieldID GetStaticFieldID (JniObjectReference jclass,
 			return tmp;
 		}
 
-		internal static unsafe JniObjectReference GetStaticObjectField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe char CallStaticCharMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
-			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
-		}
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
-		internal static unsafe bool GetStaticBooleanField (JniObjectReference jclass, jstaticFieldID jfieldID)
-		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe sbyte GetStaticByteField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe char CallStaticCharMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticCharMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticByteField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe char GetStaticCharField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe short CallStaticShortMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticCharField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe short GetStaticShortField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe short CallStaticShortMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticShortMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticShortField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe int GetStaticIntField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe int CallStaticIntMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticIntField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe long GetStaticLongField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe int CallStaticIntMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticIntMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticLongField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe float GetStaticFloatField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe long CallStaticLongMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe double GetStaticDoubleField (JniObjectReference jclass, jstaticFieldID jfieldID)
+		internal static unsafe long CallStaticLongMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			var tmp = JniEnvironment.Current.Invoker.CallStaticLongMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.GetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID);
 			return tmp;
 		}
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, JniObjectReference val)
+		internal static unsafe float CallStaticFloatMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.SetStaticObjectField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val.Handle);
-		}
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, bool val)
-		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			JniEnvironment.Current.Invoker.SetStaticBooleanField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
+			return tmp;
 		}
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, sbyte val)
+		internal static unsafe float CallStaticFloatMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.SetStaticByteField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
-		}
+			var tmp = JniEnvironment.Current.Invoker.CallStaticFloatMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, char val)
-		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			JniEnvironment.Current.Invoker.SetStaticCharField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
+			return tmp;
 		}
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, short val)
+		internal static unsafe double CallStaticDoubleMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.SetStaticShortField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
-		}
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, int val)
-		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			JniEnvironment.Current.Invoker.SetStaticIntField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
+			return tmp;
 		}
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, long val)
+		internal static unsafe double CallStaticDoubleMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-			JniEnvironment.Current.Invoker.SetStaticLongField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
-		}
+			var tmp = JniEnvironment.Current.Invoker.CallStaticDoubleMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, float val)
-		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			JniEnvironment.Current.Invoker.SetStaticFloatField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
+			return tmp;
 		}
 
-		internal static unsafe void SetStaticField (JniObjectReference jclass, jstaticFieldID jfieldID, double val)
+		internal static unsafe void CallStaticVoidMethod (IntPtr klass, IntPtr method)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
-			if (jfieldID == IntPtr.Zero)
-				throw new ArgumentNullException ("jfieldID");
-
-			JniEnvironment.Current.Invoker.SetStaticDoubleField (JniEnvironment.Current.SafeHandle, jclass.Handle, jfieldID, val);
-		}
-	}
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
 
-	internal static partial class Monitors {
+			JniEnvironment.Current.Invoker.CallStaticVoidMethod (JniEnvironment.Current.EnvironmentPointer, klass, method);
 
-		public static unsafe int MonitorEnter (JniObjectReference obj)
-		{
-			if (obj.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.MonitorEnter (JniEnvironment.Current.SafeHandle, obj.Handle);
-			return tmp;
 		}
 
-		public static unsafe int MonitorExit (JniObjectReference obj)
+		internal static unsafe void CallStaticVoidMethod (IntPtr klass, IntPtr method, JValue* args)
 		{
-			if (obj.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
+			if (method == IntPtr.Zero)
+				throw new ArgumentException ("Handle value cannot be null.", "method");
+
+			JniEnvironment.Current.Invoker.CallStaticVoidMethodA (JniEnvironment.Current.EnvironmentPointer, klass, method, args);
+
+			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
+			if (__e != null)
+				throw __e;
 
-			var tmp = JniEnvironment.Current.Invoker.MonitorExit (JniEnvironment.Current.SafeHandle, obj.Handle);
-			return tmp;
 		}
 	}
 
 	public static partial class Strings {
 
-		internal static unsafe JniObjectReference NewString (IntPtr unicodeChars, int len)
+		internal static unsafe IntPtr NewString (IntPtr unicodeChars, int length)
 		{
 			if (unicodeChars == IntPtr.Zero)
 				throw new ArgumentException ("'unicodeChars' must not be IntPtr.Zero.", "unicodeChars");
 
-			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.SafeHandle, unicodeChars, len);
+			var tmp = JniEnvironment.Current.Invoker.NewString (JniEnvironment.Current.EnvironmentPointer, unicodeChars, length);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			return tmp;
 		}
 
-		internal static unsafe int GetStringLength (JniObjectReference @string)
+		internal static unsafe int GetStringLength (IntPtr @string)
 		{
-			if (@string.Handle == IntPtr.Zero)
+			if (@string == IntPtr.Zero)
 				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.SafeHandle, @string.Handle);
+			var tmp = JniEnvironment.Current.Invoker.GetStringLength (JniEnvironment.Current.EnvironmentPointer, @string);
 			return tmp;
 		}
 
-		internal static unsafe IntPtr GetStringChars (JniObjectReference @string, IntPtr isCopy)
+		internal static unsafe IntPtr GetStringChars (IntPtr @string, IntPtr isCopy)
 		{
-			if (@string.Handle == IntPtr.Zero)
+			if (@string == IntPtr.Zero)
 				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
 
-			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.SafeHandle, @string.Handle, isCopy);
+			var tmp = JniEnvironment.Current.Invoker.GetStringChars (JniEnvironment.Current.EnvironmentPointer, @string, isCopy);
 			return tmp;
 		}
 
-		internal static unsafe void ReleaseStringChars (JniObjectReference @string, IntPtr chars)
+		internal static unsafe void ReleaseStringChars (IntPtr @string, IntPtr chars)
 		{
-			if (@string.Handle == IntPtr.Zero)
+			if (@string == IntPtr.Zero)
 				throw new ArgumentException ("`@string` must not be IntPtr.Zero.", "@string");
 			if (chars == IntPtr.Zero)
 				throw new ArgumentException ("'chars' must not be IntPtr.Zero.", "chars");
 
-			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.SafeHandle, @string.Handle, chars);
+			JniEnvironment.Current.Invoker.ReleaseStringChars (JniEnvironment.Current.EnvironmentPointer, @string, chars);
 		}
 	}
 
 	public static partial class Types {
 
-		internal static unsafe JniObjectReference DefineClass (string name, JniObjectReference loader, IntPtr buf, int bufLen)
+		internal static unsafe IntPtr DefineClass (string name, IntPtr loader, IntPtr buffer, int bufferLength)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name");
-			if (loader.Handle == IntPtr.Zero)
+			if (loader == IntPtr.Zero)
 				throw new ArgumentException ("`loader` must not be IntPtr.Zero.", "loader");
-			if (buf == IntPtr.Zero)
-				throw new ArgumentException ("'buf' must not be IntPtr.Zero.", "buf");
+			if (buffer == IntPtr.Zero)
+				throw new ArgumentException ("'buffer' must not be IntPtr.Zero.", "buffer");
 
-			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.SafeHandle, name, loader.Handle, buf, bufLen);
+			var tmp = JniEnvironment.Current.Invoker.DefineClass (JniEnvironment.Current.EnvironmentPointer, name, loader, buffer, bufferLength);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			return tmp;
 		}
 
-		public static unsafe JniObjectReference FindClass (string classname)
+		public static unsafe IntPtr FindClass (string classname)
 		{
 			if (classname == null)
 				throw new ArgumentNullException ("classname");
 
-			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.SafeHandle, classname);
+			var tmp = JniEnvironment.Current.Invoker.FindClass (JniEnvironment.Current.EnvironmentPointer, classname);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
 				throw __e;
 
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			return tmp;
 		}
 
-		public static unsafe JniObjectReference GetSuperclass (JniObjectReference jclass)
+		public static unsafe IntPtr GetSuperclass (IntPtr klass)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 
-			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.SafeHandle, jclass.Handle);
+			var tmp = JniEnvironment.Current.Invoker.GetSuperclass (JniEnvironment.Current.EnvironmentPointer, klass);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			return tmp;
 		}
 
-		public static unsafe bool IsAssignableFrom (JniObjectReference clazz1, JniObjectReference clazz2)
+		public static unsafe bool IsAssignableFrom (IntPtr class1, IntPtr class2)
 		{
-			if (clazz1.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`clazz1` must not be IntPtr.Zero.", "clazz1");
-			if (clazz2.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`clazz2` must not be IntPtr.Zero.", "clazz2");
+			if (class1 == IntPtr.Zero)
+				throw new ArgumentException ("`class1` must not be IntPtr.Zero.", "class1");
+			if (class2 == IntPtr.Zero)
+				throw new ArgumentException ("`class2` must not be IntPtr.Zero.", "class2");
 
-			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.SafeHandle, clazz1.Handle, clazz2.Handle);
+			var tmp = JniEnvironment.Current.Invoker.IsAssignableFrom (JniEnvironment.Current.EnvironmentPointer, class1, class2);
 			return tmp;
 		}
 
-		public static unsafe bool IsSameObject (JniObjectReference ref1, JniObjectReference ref2)
+		public static unsafe bool IsSameObject (IntPtr object1, IntPtr object2)
 		{
-			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.SafeHandle, ref1.Handle, ref2.Handle);
+			var tmp = JniEnvironment.Current.Invoker.IsSameObject (JniEnvironment.Current.EnvironmentPointer, object1, object2);
 			return tmp;
 		}
 
-		public static unsafe JniObjectReference GetObjectClass (JniObjectReference jobject)
+		public static unsafe IntPtr GetObjectClass (IntPtr @object)
 		{
-			if (jobject.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jobject` must not be IntPtr.Zero.", "jobject");
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
 
-			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.SafeHandle, jobject.Handle);
+			var tmp = JniEnvironment.Current.Invoker.GetObjectClass (JniEnvironment.Current.EnvironmentPointer, @object);
 			JniEnvironment.Current.LogCreateLocalRef (tmp);
-			return new JniObjectReference (tmp, JniObjectReferenceType.Local);
+			return tmp;
 		}
 
-		public static unsafe bool IsInstanceOf (JniObjectReference obj, JniObjectReference clazz)
+		public static unsafe bool IsInstanceOf (IntPtr @object, IntPtr klass)
 		{
-			if (obj.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`obj` must not be IntPtr.Zero.", "obj");
-			if (clazz.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`clazz` must not be IntPtr.Zero.", "clazz");
+			if (@object == IntPtr.Zero)
+				throw new ArgumentException ("`@object` must not be IntPtr.Zero.", "@object");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 
-			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.SafeHandle, obj.Handle, clazz.Handle);
+			var tmp = JniEnvironment.Current.Invoker.IsInstanceOf (JniEnvironment.Current.EnvironmentPointer, @object, klass);
 			return tmp;
 		}
 
-		internal static unsafe int RegisterNatives (JniObjectReference jclass, JniNativeMethodRegistration [] methods, int nMethods)
+		internal static unsafe int RegisterNatives (IntPtr klass, JniNativeMethodRegistration [] methods, int numMethods)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 
-			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.SafeHandle, jclass.Handle, methods, nMethods);
+			var tmp = JniEnvironment.Current.Invoker.RegisterNatives (JniEnvironment.Current.EnvironmentPointer, klass, methods, numMethods);
 
 			Exception __e = JniEnvironment.Current.GetExceptionForLastThrowable ();
 			if (__e != null)
@@ -7655,12 +15411,12 @@ internal static unsafe int RegisterNatives (JniObjectReference jclass, JniNative
 			return tmp;
 		}
 
-		internal static unsafe int UnregisterNatives (JniObjectReference jclass)
+		internal static unsafe int UnregisterNatives (IntPtr klass)
 		{
-			if (jclass.Handle == IntPtr.Zero)
-				throw new ArgumentException ("`jclass` must not be IntPtr.Zero.", "jclass");
+			if (klass == IntPtr.Zero)
+				throw new ArgumentException ("`klass` must not be IntPtr.Zero.", "klass");
 
-			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.SafeHandle, jclass.Handle);
+			var tmp = JniEnvironment.Current.Invoker.UnregisterNatives (JniEnvironment.Current.EnvironmentPointer, klass);
 			return tmp;
 		}
 	}
@@ -7669,7 +15425,7 @@ internal static partial class Versions {
 
 		internal static unsafe int GetVersion ()
 		{
-			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.SafeHandle);
+			var tmp = JniEnvironment.Current.Invoker.GetVersion (JniEnvironment.Current.EnvironmentPointer);
 			return tmp;
 		}
 	}
@@ -7685,1787 +15441,1787 @@ public unsafe JniEnvironmentInvoker (JniNativeInterfaceStruct* p)
 		}
 
 
-		JniFunc_JniEnvironmentSafeHandle_int _GetVersion;
-		public JniFunc_JniEnvironmentSafeHandle_int GetVersion {
+		JniFunc_JNIEnvPtr_int _GetVersion;
+		public JniFunc_JNIEnvPtr_int GetVersion {
 			get {
 				if (_GetVersion == null)
-					_GetVersion = (JniFunc_JniEnvironmentSafeHandle_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JniEnvironmentSafeHandle_int));
+					_GetVersion = (JniFunc_JNIEnvPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetVersion, typeof (JniFunc_JNIEnvPtr_int));
 				return _GetVersion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_jobject_IntPtr_int_jobject _DefineClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_jobject_IntPtr_int_jobject DefineClass {
+		JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject _DefineClass;
+		public JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject DefineClass {
 			get {
 				if (_DefineClass == null)
-					_DefineClass = (JniFunc_JniEnvironmentSafeHandle_string_jobject_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_jobject_IntPtr_int_jobject));
+					_DefineClass = (JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.DefineClass, typeof (JniFunc_JNIEnvPtr_string_jobject_IntPtr_int_jobject));
 				return _DefineClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_jobject _FindClass;
-		public JniFunc_JniEnvironmentSafeHandle_string_jobject FindClass {
+		JniFunc_JNIEnvPtr_string_jobject _FindClass;
+		public JniFunc_JNIEnvPtr_string_jobject FindClass {
 			get {
 				if (_FindClass == null)
-					_FindClass = (JniFunc_JniEnvironmentSafeHandle_string_jobject) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JniEnvironmentSafeHandle_string_jobject));
+					_FindClass = (JniFunc_JNIEnvPtr_string_jobject) Marshal.GetDelegateForFunctionPointer (env.FindClass, typeof (JniFunc_JNIEnvPtr_string_jobject));
 				return _FindClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID _FromReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID FromReflectedMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr _FromReflectedMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr FromReflectedMethod {
 			get {
 				if (_FromReflectedMethod == null)
-					_FromReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID));
+					_FromReflectedMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
 				return _FromReflectedMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID _FromReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID FromReflectedField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr _FromReflectedField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr FromReflectedField {
 			get {
 				if (_FromReflectedField == null)
-					_FromReflectedField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID));
+					_FromReflectedField = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.FromReflectedField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
 				return _FromReflectedField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool_jobject _ToReflectedMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool_jobject ToReflectedMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject _ToReflectedMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject ToReflectedMethod {
 			get {
 				if (_ToReflectedMethod == null)
-					_ToReflectedMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool_jobject));
+					_ToReflectedMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject));
 				return _ToReflectedMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _GetSuperclass;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject GetSuperclass {
+		JniFunc_JNIEnvPtr_jobject_jobject _GetSuperclass;
+		public JniFunc_JNIEnvPtr_jobject_jobject GetSuperclass {
 			get {
 				if (_GetSuperclass == null)
-					_GetSuperclass = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_GetSuperclass = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetSuperclass, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _GetSuperclass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool _IsAssignableFrom;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool IsAssignableFrom {
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsAssignableFrom;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsAssignableFrom {
 			get {
 				if (_IsAssignableFrom == null)
-					_IsAssignableFrom = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool));
+					_IsAssignableFrom = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsAssignableFrom, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
 				return _IsAssignableFrom;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool_jobject _ToReflectedField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool_jobject ToReflectedField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject _ToReflectedField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject ToReflectedField {
 			get {
 				if (_ToReflectedField == null)
-					_ToReflectedField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool_jobject));
+					_ToReflectedField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject) Marshal.GetDelegateForFunctionPointer (env.ToReflectedField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool_jobject));
 				return _ToReflectedField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _Throw;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int Throw {
+		JniFunc_JNIEnvPtr_jobject_int _Throw;
+		public JniFunc_JNIEnvPtr_jobject_int Throw {
 			get {
 				if (_Throw == null)
-					_Throw = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_Throw = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.Throw, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _Throw;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_string_int _ThrowNew;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_string_int ThrowNew {
+		JniFunc_JNIEnvPtr_jobject_string_int _ThrowNew;
+		public JniFunc_JNIEnvPtr_jobject_string_int ThrowNew {
 			get {
 				if (_ThrowNew == null)
-					_ThrowNew = (JniFunc_JniEnvironmentSafeHandle_jobject_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_string_int));
+					_ThrowNew = (JniFunc_JNIEnvPtr_jobject_string_int) Marshal.GetDelegateForFunctionPointer (env.ThrowNew, typeof (JniFunc_JNIEnvPtr_jobject_string_int));
 				return _ThrowNew;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject _ExceptionOccurred;
-		public JniFunc_JniEnvironmentSafeHandle_jobject ExceptionOccurred {
+		JniFunc_JNIEnvPtr_jobject _ExceptionOccurred;
+		public JniFunc_JNIEnvPtr_jobject ExceptionOccurred {
 			get {
 				if (_ExceptionOccurred == null)
-					_ExceptionOccurred = (JniFunc_JniEnvironmentSafeHandle_jobject) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JniEnvironmentSafeHandle_jobject));
+					_ExceptionOccurred = (JniFunc_JNIEnvPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.ExceptionOccurred, typeof (JniFunc_JNIEnvPtr_jobject));
 				return _ExceptionOccurred;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle _ExceptionDescribe;
-		public JniAction_JniEnvironmentSafeHandle ExceptionDescribe {
+		JniAction_JNIEnvPtr _ExceptionDescribe;
+		public JniAction_JNIEnvPtr ExceptionDescribe {
 			get {
 				if (_ExceptionDescribe == null)
-					_ExceptionDescribe = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JniEnvironmentSafeHandle));
+					_ExceptionDescribe = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionDescribe, typeof (JniAction_JNIEnvPtr));
 				return _ExceptionDescribe;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle _ExceptionClear;
-		public JniAction_JniEnvironmentSafeHandle ExceptionClear {
+		JniAction_JNIEnvPtr _ExceptionClear;
+		public JniAction_JNIEnvPtr ExceptionClear {
 			get {
 				if (_ExceptionClear == null)
-					_ExceptionClear = (JniAction_JniEnvironmentSafeHandle) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JniEnvironmentSafeHandle));
+					_ExceptionClear = (JniAction_JNIEnvPtr) Marshal.GetDelegateForFunctionPointer (env.ExceptionClear, typeof (JniAction_JNIEnvPtr));
 				return _ExceptionClear;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_string _FatalError;
-		public JniAction_JniEnvironmentSafeHandle_string FatalError {
+		JniAction_JNIEnvPtr_string _FatalError;
+		public JniAction_JNIEnvPtr_string FatalError {
 			get {
 				if (_FatalError == null)
-					_FatalError = (JniAction_JniEnvironmentSafeHandle_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JniEnvironmentSafeHandle_string));
+					_FatalError = (JniAction_JNIEnvPtr_string) Marshal.GetDelegateForFunctionPointer (env.FatalError, typeof (JniAction_JNIEnvPtr_string));
 				return _FatalError;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_int _PushLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_int_int PushLocalFrame {
+		JniFunc_JNIEnvPtr_int_int _PushLocalFrame;
+		public JniFunc_JNIEnvPtr_int_int PushLocalFrame {
 			get {
 				if (_PushLocalFrame == null)
-					_PushLocalFrame = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
+					_PushLocalFrame = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.PushLocalFrame, typeof (JniFunc_JNIEnvPtr_int_int));
 				return _PushLocalFrame;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _PopLocalFrame;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject PopLocalFrame {
+		JniFunc_JNIEnvPtr_jobject_jobject _PopLocalFrame;
+		public JniFunc_JNIEnvPtr_jobject_jobject PopLocalFrame {
 			get {
 				if (_PopLocalFrame == null)
-					_PopLocalFrame = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_PopLocalFrame = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.PopLocalFrame, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _PopLocalFrame;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _NewGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject NewGlobalRef {
+		JniFunc_JNIEnvPtr_jobject_jobject _NewGlobalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewGlobalRef {
 			get {
 				if (_NewGlobalRef == null)
-					_NewGlobalRef = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_NewGlobalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewGlobalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _NewGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteGlobalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteGlobalRef {
 			get {
 				if (_DeleteGlobalRef == null)
-					_DeleteGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteLocalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteLocalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteLocalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteLocalRef {
 			get {
 				if (_DeleteLocalRef == null)
-					_DeleteLocalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteLocalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteLocalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteLocalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool _IsSameObject;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool IsSameObject {
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsSameObject;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsSameObject {
 			get {
 				if (_IsSameObject == null)
-					_IsSameObject = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool));
+					_IsSameObject = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsSameObject, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
 				return _IsSameObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _NewLocalRef;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject NewLocalRef {
+		JniFunc_JNIEnvPtr_jobject_jobject _NewLocalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewLocalRef {
 			get {
 				if (_NewLocalRef == null)
-					_NewLocalRef = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_NewLocalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLocalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _NewLocalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_int _EnsureLocalCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_int_int EnsureLocalCapacity {
+		JniFunc_JNIEnvPtr_int_int _EnsureLocalCapacity;
+		public JniFunc_JNIEnvPtr_int_int EnsureLocalCapacity {
 			get {
 				if (_EnsureLocalCapacity == null)
-					_EnsureLocalCapacity = (JniFunc_JniEnvironmentSafeHandle_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_int_int));
+					_EnsureLocalCapacity = (JniFunc_JNIEnvPtr_int_int) Marshal.GetDelegateForFunctionPointer (env.EnsureLocalCapacity, typeof (JniFunc_JNIEnvPtr_int_int));
 				return _EnsureLocalCapacity;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _AllocObject;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject AllocObject {
+		JniFunc_JNIEnvPtr_jobject_jobject _AllocObject;
+		public JniFunc_JNIEnvPtr_jobject_jobject AllocObject {
 			get {
 				if (_AllocObject == null)
-					_AllocObject = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_AllocObject = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.AllocObject, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _AllocObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject _NewObject;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject NewObject {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _NewObject;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject NewObject {
 			get {
 				if (_NewObject == null)
-					_NewObject = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject));
+					_NewObject = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObject, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _NewObject;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject _NewObjectA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject NewObjectA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _NewObjectA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject NewObjectA {
 			get {
 				if (_NewObjectA == null)
-					_NewObjectA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject));
+					_NewObjectA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
 				return _NewObjectA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _GetObjectClass;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject GetObjectClass {
+		JniFunc_JNIEnvPtr_jobject_jobject _GetObjectClass;
+		public JniFunc_JNIEnvPtr_jobject_jobject GetObjectClass {
 			get {
 				if (_GetObjectClass == null)
-					_GetObjectClass = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_GetObjectClass = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectClass, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _GetObjectClass;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool _IsInstanceOf;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool IsInstanceOf {
+		JniFunc_JNIEnvPtr_jobject_jobject_bool _IsInstanceOf;
+		public JniFunc_JNIEnvPtr_jobject_jobject_bool IsInstanceOf {
 			get {
 				if (_IsInstanceOf == null)
-					_IsInstanceOf = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_bool));
+					_IsInstanceOf = (JniFunc_JNIEnvPtr_jobject_jobject_bool) Marshal.GetDelegateForFunctionPointer (env.IsInstanceOf, typeof (JniFunc_JNIEnvPtr_jobject_jobject_bool));
 				return _IsInstanceOf;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceMethodID _GetMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceMethodID GetMethodID {
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetMethodID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetMethodID {
 			get {
 				if (_GetMethodID == null)
-					_GetMethodID = (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceMethodID));
+					_GetMethodID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetMethodID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
 				return _GetMethodID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject _CallObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject CallObjectMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _CallObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject CallObjectMethod {
 			get {
 				if (_CallObjectMethod == null)
-					_CallObjectMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_jobject));
+					_CallObjectMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _CallObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject _CallObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject CallObjectMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _CallObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject CallObjectMethodA {
 			get {
 				if (_CallObjectMethodA == null)
-					_CallObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_jobject));
+					_CallObjectMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
 				return _CallObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool _CallBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool CallBooleanMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _CallBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool CallBooleanMethod {
 			get {
 				if (_CallBooleanMethod == null)
-					_CallBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_bool));
+					_CallBooleanMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
 				return _CallBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_bool _CallBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_bool CallBooleanMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool _CallBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool CallBooleanMethodA {
 			get {
 				if (_CallBooleanMethodA == null)
-					_CallBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_bool));
+					_CallBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool));
 				return _CallBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_sbyte _CallSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_sbyte CallSByteMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _CallByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte CallByteMethod {
 			get {
-				if (_CallSByteMethod == null)
-					_CallSByteMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_sbyte));
-				return _CallSByteMethod;
+				if (_CallByteMethod == null)
+					_CallByteMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _CallByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_sbyte _CallSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_sbyte CallSByteMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte _CallByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte CallByteMethodA {
 			get {
-				if (_CallSByteMethodA == null)
-					_CallSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_sbyte));
-				return _CallSByteMethodA;
+				if (_CallByteMethodA == null)
+					_CallByteMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte));
+				return _CallByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_char _CallCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_char CallCharMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _CallCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char CallCharMethod {
 			get {
 				if (_CallCharMethod == null)
-					_CallCharMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_char));
+					_CallCharMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
 				return _CallCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_char _CallCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_char CallCharMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char _CallCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char CallCharMethodA {
 			get {
 				if (_CallCharMethodA == null)
-					_CallCharMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_char));
+					_CallCharMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char));
 				return _CallCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_short _CallShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_short CallShortMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _CallShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short CallShortMethod {
 			get {
 				if (_CallShortMethod == null)
-					_CallShortMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_short));
+					_CallShortMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
 				return _CallShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_short _CallShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_short CallShortMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short _CallShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short CallShortMethodA {
 			get {
 				if (_CallShortMethodA == null)
-					_CallShortMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_short));
+					_CallShortMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short));
 				return _CallShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_int _CallIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_int CallIntMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _CallIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int CallIntMethod {
 			get {
 				if (_CallIntMethod == null)
-					_CallIntMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_int));
+					_CallIntMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
 				return _CallIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_int _CallIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_int CallIntMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int _CallIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int CallIntMethodA {
 			get {
 				if (_CallIntMethodA == null)
-					_CallIntMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_int));
+					_CallIntMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int));
 				return _CallIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_long _CallLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_long CallLongMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _CallLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long CallLongMethod {
 			get {
 				if (_CallLongMethod == null)
-					_CallLongMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_long));
+					_CallLongMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
 				return _CallLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_long _CallLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_long CallLongMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long _CallLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long CallLongMethodA {
 			get {
 				if (_CallLongMethodA == null)
-					_CallLongMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_long));
+					_CallLongMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long));
 				return _CallLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_float _CallFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_float CallFloatMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _CallFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float CallFloatMethod {
 			get {
 				if (_CallFloatMethod == null)
-					_CallFloatMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_float));
+					_CallFloatMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
 				return _CallFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_float _CallFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_float CallFloatMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float _CallFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float CallFloatMethodA {
 			get {
 				if (_CallFloatMethodA == null)
-					_CallFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_float));
+					_CallFloatMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float));
 				return _CallFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_double _CallDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_double CallDoubleMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _CallDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double CallDoubleMethod {
 			get {
 				if (_CallDoubleMethod == null)
-					_CallDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_double));
+					_CallDoubleMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
 				return _CallDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_double _CallDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_double CallDoubleMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double _CallDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double CallDoubleMethodA {
 			get {
 				if (_CallDoubleMethodA == null)
-					_CallDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef_double));
+					_CallDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double));
 				return _CallDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID _CallVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID CallVoidMethod {
+		JniAction_JNIEnvPtr_jobject_IntPtr _CallVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_IntPtr CallVoidMethod {
 			get {
 				if (_CallVoidMethod == null)
-					_CallVoidMethod = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID));
+					_CallVoidMethod = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
 				return _CallVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef _CallVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef CallVoidMethodA {
+		JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef _CallVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef CallVoidMethodA {
 			get {
 				if (_CallVoidMethodA == null)
-					_CallVoidMethodA = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceMethodID_JValueRef));
+					_CallVoidMethodA = (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef));
 				return _CallVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_jobject _CallNonvirtualObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_jobject CallNonvirtualObjectMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject _CallNonvirtualObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject CallNonvirtualObjectMethod {
 			get {
 				if (_CallNonvirtualObjectMethod == null)
-					_CallNonvirtualObjectMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_jobject));
+					_CallNonvirtualObjectMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_jobject));
 				return _CallNonvirtualObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_jobject _CallNonvirtualObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_jobject CallNonvirtualObjectMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject _CallNonvirtualObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject CallNonvirtualObjectMethodA {
 			get {
 				if (_CallNonvirtualObjectMethodA == null)
-					_CallNonvirtualObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_jobject));
+					_CallNonvirtualObjectMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_jobject));
 				return _CallNonvirtualObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_bool _CallNonvirtualBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_bool CallNonvirtualBooleanMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool _CallNonvirtualBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool CallNonvirtualBooleanMethod {
 			get {
 				if (_CallNonvirtualBooleanMethod == null)
-					_CallNonvirtualBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_bool));
+					_CallNonvirtualBooleanMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_bool));
 				return _CallNonvirtualBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_bool _CallNonvirtualBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_bool CallNonvirtualBooleanMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool _CallNonvirtualBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool CallNonvirtualBooleanMethodA {
 			get {
 				if (_CallNonvirtualBooleanMethodA == null)
-					_CallNonvirtualBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_bool));
+					_CallNonvirtualBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_bool));
 				return _CallNonvirtualBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_sbyte _CallNonvirtualSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_sbyte CallNonvirtualSByteMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte _CallNonvirtualByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte CallNonvirtualByteMethod {
 			get {
-				if (_CallNonvirtualSByteMethod == null)
-					_CallNonvirtualSByteMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_sbyte));
-				return _CallNonvirtualSByteMethod;
+				if (_CallNonvirtualByteMethod == null)
+					_CallNonvirtualByteMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_sbyte));
+				return _CallNonvirtualByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_sbyte _CallNonvirtualSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_sbyte CallNonvirtualSByteMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte _CallNonvirtualByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte CallNonvirtualByteMethodA {
 			get {
-				if (_CallNonvirtualSByteMethodA == null)
-					_CallNonvirtualSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_sbyte));
-				return _CallNonvirtualSByteMethodA;
+				if (_CallNonvirtualByteMethodA == null)
+					_CallNonvirtualByteMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_sbyte));
+				return _CallNonvirtualByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_char _CallNonvirtualCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_char CallNonvirtualCharMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char _CallNonvirtualCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char CallNonvirtualCharMethod {
 			get {
 				if (_CallNonvirtualCharMethod == null)
-					_CallNonvirtualCharMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_char));
+					_CallNonvirtualCharMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_char));
 				return _CallNonvirtualCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_char _CallNonvirtualCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_char CallNonvirtualCharMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char _CallNonvirtualCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char CallNonvirtualCharMethodA {
 			get {
 				if (_CallNonvirtualCharMethodA == null)
-					_CallNonvirtualCharMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_char));
+					_CallNonvirtualCharMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_char));
 				return _CallNonvirtualCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_short _CallNonvirtualShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_short CallNonvirtualShortMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short _CallNonvirtualShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short CallNonvirtualShortMethod {
 			get {
 				if (_CallNonvirtualShortMethod == null)
-					_CallNonvirtualShortMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_short));
+					_CallNonvirtualShortMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_short));
 				return _CallNonvirtualShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_short _CallNonvirtualShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_short CallNonvirtualShortMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short _CallNonvirtualShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short CallNonvirtualShortMethodA {
 			get {
 				if (_CallNonvirtualShortMethodA == null)
-					_CallNonvirtualShortMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_short));
+					_CallNonvirtualShortMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_short));
 				return _CallNonvirtualShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_int _CallNonvirtualIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_int CallNonvirtualIntMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int _CallNonvirtualIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int CallNonvirtualIntMethod {
 			get {
 				if (_CallNonvirtualIntMethod == null)
-					_CallNonvirtualIntMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_int));
+					_CallNonvirtualIntMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_int));
 				return _CallNonvirtualIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_int _CallNonvirtualIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_int CallNonvirtualIntMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int _CallNonvirtualIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int CallNonvirtualIntMethodA {
 			get {
 				if (_CallNonvirtualIntMethodA == null)
-					_CallNonvirtualIntMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_int));
+					_CallNonvirtualIntMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_int));
 				return _CallNonvirtualIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_long _CallNonvirtualLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_long CallNonvirtualLongMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long _CallNonvirtualLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long CallNonvirtualLongMethod {
 			get {
 				if (_CallNonvirtualLongMethod == null)
-					_CallNonvirtualLongMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_long));
+					_CallNonvirtualLongMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_long));
 				return _CallNonvirtualLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_long _CallNonvirtualLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_long CallNonvirtualLongMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long _CallNonvirtualLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long CallNonvirtualLongMethodA {
 			get {
 				if (_CallNonvirtualLongMethodA == null)
-					_CallNonvirtualLongMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_long));
+					_CallNonvirtualLongMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_long));
 				return _CallNonvirtualLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_float _CallNonvirtualFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_float CallNonvirtualFloatMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float _CallNonvirtualFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float CallNonvirtualFloatMethod {
 			get {
 				if (_CallNonvirtualFloatMethod == null)
-					_CallNonvirtualFloatMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_float));
+					_CallNonvirtualFloatMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_float));
 				return _CallNonvirtualFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_float _CallNonvirtualFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_float CallNonvirtualFloatMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float _CallNonvirtualFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float CallNonvirtualFloatMethodA {
 			get {
 				if (_CallNonvirtualFloatMethodA == null)
-					_CallNonvirtualFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_float));
+					_CallNonvirtualFloatMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_float));
 				return _CallNonvirtualFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_double _CallNonvirtualDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_double CallNonvirtualDoubleMethod {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double _CallNonvirtualDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double CallNonvirtualDoubleMethod {
 			get {
 				if (_CallNonvirtualDoubleMethod == null)
-					_CallNonvirtualDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_double));
+					_CallNonvirtualDoubleMethod = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_double));
 				return _CallNonvirtualDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_double _CallNonvirtualDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_double CallNonvirtualDoubleMethodA {
+		JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double _CallNonvirtualDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double CallNonvirtualDoubleMethodA {
 			get {
 				if (_CallNonvirtualDoubleMethodA == null)
-					_CallNonvirtualDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef_double));
+					_CallNonvirtualDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef_double));
 				return _CallNonvirtualDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID _CallNonvirtualVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID CallNonvirtualVoidMethod {
+		JniAction_JNIEnvPtr_jobject_jobject_IntPtr _CallNonvirtualVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_jobject_IntPtr CallNonvirtualVoidMethod {
 			get {
 				if (_CallNonvirtualVoidMethod == null)
-					_CallNonvirtualVoidMethod = (JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID));
+					_CallNonvirtualVoidMethod = (JniAction_JNIEnvPtr_jobject_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_jobject_IntPtr));
 				return _CallNonvirtualVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef _CallNonvirtualVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef CallNonvirtualVoidMethodA {
+		JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef _CallNonvirtualVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef CallNonvirtualVoidMethodA {
 			get {
 				if (_CallNonvirtualVoidMethodA == null)
-					_CallNonvirtualVoidMethodA = (JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jobject_jinstanceMethodID_JValueRef));
+					_CallNonvirtualVoidMethodA = (JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallNonvirtualVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_jobject_IntPtr_JValueRef));
 				return _CallNonvirtualVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceFieldID _GetFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceFieldID GetFieldID {
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetFieldID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetFieldID {
 			get {
 				if (_GetFieldID == null)
-					_GetFieldID = (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceFieldID) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jinstanceFieldID));
+					_GetFieldID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFieldID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
 				return _GetFieldID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject _GetObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject GetObjectField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _GetObjectField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject GetObjectField {
 			get {
 				if (_GetObjectField == null)
-					_GetObjectField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject));
+					_GetObjectField = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _GetObjectField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool _GetBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool GetBooleanField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _GetBooleanField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool GetBooleanField {
 			get {
 				if (_GetBooleanField == null)
-					_GetBooleanField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool));
+					_GetBooleanField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetBooleanField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
 				return _GetBooleanField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte _GetByteField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte GetByteField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _GetByteField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte GetByteField {
 			get {
 				if (_GetByteField == null)
-					_GetByteField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte));
+					_GetByteField = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetByteField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
 				return _GetByteField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char _GetCharField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char GetCharField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _GetCharField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char GetCharField {
 			get {
 				if (_GetCharField == null)
-					_GetCharField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char));
+					_GetCharField = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetCharField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
 				return _GetCharField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short _GetShortField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short GetShortField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _GetShortField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short GetShortField {
 			get {
 				if (_GetShortField == null)
-					_GetShortField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short));
+					_GetShortField = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetShortField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
 				return _GetShortField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int _GetIntField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int GetIntField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _GetIntField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int GetIntField {
 			get {
 				if (_GetIntField == null)
-					_GetIntField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int));
+					_GetIntField = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetIntField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
 				return _GetIntField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long _GetLongField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long GetLongField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _GetLongField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long GetLongField {
 			get {
 				if (_GetLongField == null)
-					_GetLongField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long));
+					_GetLongField = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetLongField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
 				return _GetLongField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float _GetFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float GetFloatField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _GetFloatField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float GetFloatField {
 			get {
 				if (_GetFloatField == null)
-					_GetFloatField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float));
+					_GetFloatField = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetFloatField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
 				return _GetFloatField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double _GetDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double GetDoubleField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _GetDoubleField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double GetDoubleField {
 			get {
 				if (_GetDoubleField == null)
-					_GetDoubleField = (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double));
+					_GetDoubleField = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetDoubleField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
 				return _GetDoubleField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject _SetObjectField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject SetObjectField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_jobject _SetObjectField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_jobject SetObjectField {
 			get {
 				if (_SetObjectField == null)
-					_SetObjectField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_jobject));
+					_SetObjectField = (JniAction_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _SetObjectField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool _SetBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool SetBooleanField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_bool _SetBooleanField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_bool SetBooleanField {
 			get {
 				if (_SetBooleanField == null)
-					_SetBooleanField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_bool));
+					_SetBooleanField = (JniAction_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetBooleanField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_bool));
 				return _SetBooleanField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte _SetByteField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte SetByteField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_sbyte _SetByteField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_sbyte SetByteField {
 			get {
 				if (_SetByteField == null)
-					_SetByteField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_sbyte));
+					_SetByteField = (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetByteField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte));
 				return _SetByteField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char _SetCharField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char SetCharField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_char _SetCharField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_char SetCharField {
 			get {
 				if (_SetCharField == null)
-					_SetCharField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_char));
+					_SetCharField = (JniAction_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetCharField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_char));
 				return _SetCharField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short _SetShortField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short SetShortField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_short _SetShortField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_short SetShortField {
 			get {
 				if (_SetShortField == null)
-					_SetShortField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_short));
+					_SetShortField = (JniAction_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetShortField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_short));
 				return _SetShortField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int _SetIntField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int SetIntField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _SetIntField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int SetIntField {
 			get {
 				if (_SetIntField == null)
-					_SetIntField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_int));
+					_SetIntField = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetIntField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _SetIntField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long _SetLongField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long SetLongField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_long _SetLongField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_long SetLongField {
 			get {
 				if (_SetLongField == null)
-					_SetLongField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_long));
+					_SetLongField = (JniAction_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetLongField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_long));
 				return _SetLongField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float _SetFloatField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float SetFloatField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_float _SetFloatField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_float SetFloatField {
 			get {
 				if (_SetFloatField == null)
-					_SetFloatField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_float));
+					_SetFloatField = (JniAction_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetFloatField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_float));
 				return _SetFloatField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double _SetDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double SetDoubleField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_double _SetDoubleField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_double SetDoubleField {
 			get {
 				if (_SetDoubleField == null)
-					_SetDoubleField = (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jinstanceFieldID_double));
+					_SetDoubleField = (JniAction_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetDoubleField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_double));
 				return _SetDoubleField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticMethodID _GetStaticMethodID;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticMethodID GetStaticMethodID {
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetStaticMethodID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetStaticMethodID {
 			get {
 				if (_GetStaticMethodID == null)
-					_GetStaticMethodID = (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticMethodID) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticMethodID));
+					_GetStaticMethodID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticMethodID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
 				return _GetStaticMethodID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_jobject _CallStaticObjectMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_jobject CallStaticObjectMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _CallStaticObjectMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject CallStaticObjectMethod {
 			get {
 				if (_CallStaticObjectMethod == null)
-					_CallStaticObjectMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_jobject));
+					_CallStaticObjectMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _CallStaticObjectMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_jobject _CallStaticObjectMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_jobject CallStaticObjectMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject _CallStaticObjectMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject CallStaticObjectMethodA {
 			get {
 				if (_CallStaticObjectMethodA == null)
-					_CallStaticObjectMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_jobject));
+					_CallStaticObjectMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject) Marshal.GetDelegateForFunctionPointer (env.CallStaticObjectMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_jobject));
 				return _CallStaticObjectMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_bool _CallStaticBooleanMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_bool CallStaticBooleanMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _CallStaticBooleanMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool CallStaticBooleanMethod {
 			get {
 				if (_CallStaticBooleanMethod == null)
-					_CallStaticBooleanMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_bool));
+					_CallStaticBooleanMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
 				return _CallStaticBooleanMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_bool _CallStaticBooleanMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_bool CallStaticBooleanMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool _CallStaticBooleanMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool CallStaticBooleanMethodA {
 			get {
 				if (_CallStaticBooleanMethodA == null)
-					_CallStaticBooleanMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_bool));
+					_CallStaticBooleanMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool) Marshal.GetDelegateForFunctionPointer (env.CallStaticBooleanMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_bool));
 				return _CallStaticBooleanMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_sbyte _CallStaticSByteMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_sbyte CallStaticSByteMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _CallStaticByteMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte CallStaticByteMethod {
 			get {
-				if (_CallStaticSByteMethod == null)
-					_CallStaticSByteMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_sbyte));
-				return _CallStaticSByteMethod;
+				if (_CallStaticByteMethod == null)
+					_CallStaticByteMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
+				return _CallStaticByteMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_sbyte _CallStaticSByteMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_sbyte CallStaticSByteMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte _CallStaticByteMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte CallStaticByteMethodA {
 			get {
-				if (_CallStaticSByteMethodA == null)
-					_CallStaticSByteMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticSByteMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_sbyte));
-				return _CallStaticSByteMethodA;
+				if (_CallStaticByteMethodA == null)
+					_CallStaticByteMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte) Marshal.GetDelegateForFunctionPointer (env.CallStaticByteMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_sbyte));
+				return _CallStaticByteMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_char _CallStaticCharMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_char CallStaticCharMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _CallStaticCharMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char CallStaticCharMethod {
 			get {
 				if (_CallStaticCharMethod == null)
-					_CallStaticCharMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_char));
+					_CallStaticCharMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
 				return _CallStaticCharMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_char _CallStaticCharMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_char CallStaticCharMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char _CallStaticCharMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char CallStaticCharMethodA {
 			get {
 				if (_CallStaticCharMethodA == null)
-					_CallStaticCharMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_char));
+					_CallStaticCharMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char) Marshal.GetDelegateForFunctionPointer (env.CallStaticCharMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_char));
 				return _CallStaticCharMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_short _CallStaticShortMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_short CallStaticShortMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _CallStaticShortMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short CallStaticShortMethod {
 			get {
 				if (_CallStaticShortMethod == null)
-					_CallStaticShortMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_short));
+					_CallStaticShortMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
 				return _CallStaticShortMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_short _CallStaticShortMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_short CallStaticShortMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short _CallStaticShortMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short CallStaticShortMethodA {
 			get {
 				if (_CallStaticShortMethodA == null)
-					_CallStaticShortMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_short));
+					_CallStaticShortMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short) Marshal.GetDelegateForFunctionPointer (env.CallStaticShortMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_short));
 				return _CallStaticShortMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_int _CallStaticIntMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_int CallStaticIntMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _CallStaticIntMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int CallStaticIntMethod {
 			get {
 				if (_CallStaticIntMethod == null)
-					_CallStaticIntMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_int));
+					_CallStaticIntMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
 				return _CallStaticIntMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_int _CallStaticIntMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_int CallStaticIntMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int _CallStaticIntMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int CallStaticIntMethodA {
 			get {
 				if (_CallStaticIntMethodA == null)
-					_CallStaticIntMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_int));
+					_CallStaticIntMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int) Marshal.GetDelegateForFunctionPointer (env.CallStaticIntMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_int));
 				return _CallStaticIntMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_long _CallStaticLongMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_long CallStaticLongMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _CallStaticLongMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long CallStaticLongMethod {
 			get {
 				if (_CallStaticLongMethod == null)
-					_CallStaticLongMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_long));
+					_CallStaticLongMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
 				return _CallStaticLongMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_long _CallStaticLongMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_long CallStaticLongMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long _CallStaticLongMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long CallStaticLongMethodA {
 			get {
 				if (_CallStaticLongMethodA == null)
-					_CallStaticLongMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_long));
+					_CallStaticLongMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long) Marshal.GetDelegateForFunctionPointer (env.CallStaticLongMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_long));
 				return _CallStaticLongMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_float _CallStaticFloatMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_float CallStaticFloatMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _CallStaticFloatMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float CallStaticFloatMethod {
 			get {
 				if (_CallStaticFloatMethod == null)
-					_CallStaticFloatMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_float));
+					_CallStaticFloatMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
 				return _CallStaticFloatMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_float _CallStaticFloatMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_float CallStaticFloatMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float _CallStaticFloatMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float CallStaticFloatMethodA {
 			get {
 				if (_CallStaticFloatMethodA == null)
-					_CallStaticFloatMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_float));
+					_CallStaticFloatMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float) Marshal.GetDelegateForFunctionPointer (env.CallStaticFloatMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_float));
 				return _CallStaticFloatMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_double _CallStaticDoubleMethod;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_double CallStaticDoubleMethod {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _CallStaticDoubleMethod;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double CallStaticDoubleMethod {
 			get {
 				if (_CallStaticDoubleMethod == null)
-					_CallStaticDoubleMethod = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_double));
+					_CallStaticDoubleMethod = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethod, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
 				return _CallStaticDoubleMethod;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_double _CallStaticDoubleMethodA;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_double CallStaticDoubleMethodA {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double _CallStaticDoubleMethodA;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double CallStaticDoubleMethodA {
 			get {
 				if (_CallStaticDoubleMethodA == null)
-					_CallStaticDoubleMethodA = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef_double));
+					_CallStaticDoubleMethodA = (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double) Marshal.GetDelegateForFunctionPointer (env.CallStaticDoubleMethodA, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_JValueRef_double));
 				return _CallStaticDoubleMethodA;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID _CallStaticVoidMethod;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID CallStaticVoidMethod {
+		JniAction_JNIEnvPtr_jobject_IntPtr _CallStaticVoidMethod;
+		public JniAction_JNIEnvPtr_jobject_IntPtr CallStaticVoidMethod {
 			get {
 				if (_CallStaticVoidMethod == null)
-					_CallStaticVoidMethod = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID));
+					_CallStaticVoidMethod = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethod, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
 				return _CallStaticVoidMethod;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef _CallStaticVoidMethodA;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef CallStaticVoidMethodA {
+		JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef _CallStaticVoidMethodA;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef CallStaticVoidMethodA {
 			get {
 				if (_CallStaticVoidMethodA == null)
-					_CallStaticVoidMethodA = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticMethodID_JValueRef));
+					_CallStaticVoidMethodA = (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef) Marshal.GetDelegateForFunctionPointer (env.CallStaticVoidMethodA, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_JValueRef));
 				return _CallStaticVoidMethodA;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticFieldID _GetStaticFieldID;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticFieldID GetStaticFieldID {
+		JniFunc_JNIEnvPtr_jobject_string_string_IntPtr _GetStaticFieldID;
+		public JniFunc_JNIEnvPtr_jobject_string_string_IntPtr GetStaticFieldID {
 			get {
 				if (_GetStaticFieldID == null)
-					_GetStaticFieldID = (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticFieldID) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_string_string_jstaticFieldID));
+					_GetStaticFieldID = (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStaticFieldID, typeof (JniFunc_JNIEnvPtr_jobject_string_string_IntPtr));
 				return _GetStaticFieldID;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject _GetStaticObjectField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject GetStaticObjectField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_jobject _GetStaticObjectField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_jobject GetStaticObjectField {
 			get {
 				if (_GetStaticObjectField == null)
-					_GetStaticObjectField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject));
+					_GetStaticObjectField = (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.GetStaticObjectField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _GetStaticObjectField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool _GetStaticBooleanField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool GetStaticBooleanField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_bool _GetStaticBooleanField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_bool GetStaticBooleanField {
 			get {
 				if (_GetStaticBooleanField == null)
-					_GetStaticBooleanField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool));
+					_GetStaticBooleanField = (JniFunc_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.GetStaticBooleanField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_bool));
 				return _GetStaticBooleanField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte _GetStaticByteField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte GetStaticByteField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte _GetStaticByteField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte GetStaticByteField {
 			get {
 				if (_GetStaticByteField == null)
-					_GetStaticByteField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte));
+					_GetStaticByteField = (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.GetStaticByteField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_sbyte));
 				return _GetStaticByteField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char _GetStaticCharField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char GetStaticCharField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_char _GetStaticCharField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_char GetStaticCharField {
 			get {
 				if (_GetStaticCharField == null)
-					_GetStaticCharField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char));
+					_GetStaticCharField = (JniFunc_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.GetStaticCharField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_char));
 				return _GetStaticCharField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short _GetStaticShortField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short GetStaticShortField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_short _GetStaticShortField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_short GetStaticShortField {
 			get {
 				if (_GetStaticShortField == null)
-					_GetStaticShortField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short));
+					_GetStaticShortField = (JniFunc_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.GetStaticShortField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_short));
 				return _GetStaticShortField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int _GetStaticIntField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int GetStaticIntField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_int _GetStaticIntField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_int GetStaticIntField {
 			get {
 				if (_GetStaticIntField == null)
-					_GetStaticIntField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int));
+					_GetStaticIntField = (JniFunc_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetStaticIntField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_int));
 				return _GetStaticIntField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long _GetStaticLongField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long GetStaticLongField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_long _GetStaticLongField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_long GetStaticLongField {
 			get {
 				if (_GetStaticLongField == null)
-					_GetStaticLongField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long));
+					_GetStaticLongField = (JniFunc_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.GetStaticLongField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_long));
 				return _GetStaticLongField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float _GetStaticFloatField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float GetStaticFloatField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_float _GetStaticFloatField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_float GetStaticFloatField {
 			get {
 				if (_GetStaticFloatField == null)
-					_GetStaticFloatField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float));
+					_GetStaticFloatField = (JniFunc_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.GetStaticFloatField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_float));
 				return _GetStaticFloatField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double _GetStaticDoubleField;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double GetStaticDoubleField {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_double _GetStaticDoubleField;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_double GetStaticDoubleField {
 			get {
 				if (_GetStaticDoubleField == null)
-					_GetStaticDoubleField = (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double));
+					_GetStaticDoubleField = (JniFunc_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.GetStaticDoubleField, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_double));
 				return _GetStaticDoubleField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject _SetStaticObjectField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject SetStaticObjectField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_jobject _SetStaticObjectField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_jobject SetStaticObjectField {
 			get {
 				if (_SetStaticObjectField == null)
-					_SetStaticObjectField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_jobject));
+					_SetStaticObjectField = (JniAction_JNIEnvPtr_jobject_IntPtr_jobject) Marshal.GetDelegateForFunctionPointer (env.SetStaticObjectField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_jobject));
 				return _SetStaticObjectField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool _SetStaticBooleanField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool SetStaticBooleanField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_bool _SetStaticBooleanField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_bool SetStaticBooleanField {
 			get {
 				if (_SetStaticBooleanField == null)
-					_SetStaticBooleanField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_bool));
+					_SetStaticBooleanField = (JniAction_JNIEnvPtr_jobject_IntPtr_bool) Marshal.GetDelegateForFunctionPointer (env.SetStaticBooleanField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_bool));
 				return _SetStaticBooleanField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte _SetStaticByteField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte SetStaticByteField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_sbyte _SetStaticByteField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_sbyte SetStaticByteField {
 			get {
 				if (_SetStaticByteField == null)
-					_SetStaticByteField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_sbyte));
+					_SetStaticByteField = (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte) Marshal.GetDelegateForFunctionPointer (env.SetStaticByteField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_sbyte));
 				return _SetStaticByteField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char _SetStaticCharField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char SetStaticCharField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_char _SetStaticCharField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_char SetStaticCharField {
 			get {
 				if (_SetStaticCharField == null)
-					_SetStaticCharField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_char));
+					_SetStaticCharField = (JniAction_JNIEnvPtr_jobject_IntPtr_char) Marshal.GetDelegateForFunctionPointer (env.SetStaticCharField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_char));
 				return _SetStaticCharField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short _SetStaticShortField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short SetStaticShortField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_short _SetStaticShortField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_short SetStaticShortField {
 			get {
 				if (_SetStaticShortField == null)
-					_SetStaticShortField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_short));
+					_SetStaticShortField = (JniAction_JNIEnvPtr_jobject_IntPtr_short) Marshal.GetDelegateForFunctionPointer (env.SetStaticShortField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_short));
 				return _SetStaticShortField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int _SetStaticIntField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int SetStaticIntField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _SetStaticIntField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int SetStaticIntField {
 			get {
 				if (_SetStaticIntField == null)
-					_SetStaticIntField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_int));
+					_SetStaticIntField = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.SetStaticIntField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _SetStaticIntField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long _SetStaticLongField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long SetStaticLongField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_long _SetStaticLongField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_long SetStaticLongField {
 			get {
 				if (_SetStaticLongField == null)
-					_SetStaticLongField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_long));
+					_SetStaticLongField = (JniAction_JNIEnvPtr_jobject_IntPtr_long) Marshal.GetDelegateForFunctionPointer (env.SetStaticLongField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_long));
 				return _SetStaticLongField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float _SetStaticFloatField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float SetStaticFloatField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_float _SetStaticFloatField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_float SetStaticFloatField {
 			get {
 				if (_SetStaticFloatField == null)
-					_SetStaticFloatField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_float));
+					_SetStaticFloatField = (JniAction_JNIEnvPtr_jobject_IntPtr_float) Marshal.GetDelegateForFunctionPointer (env.SetStaticFloatField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_float));
 				return _SetStaticFloatField;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double _SetStaticDoubleField;
-		public JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double SetStaticDoubleField {
+		JniAction_JNIEnvPtr_jobject_IntPtr_double _SetStaticDoubleField;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_double SetStaticDoubleField {
 			get {
 				if (_SetStaticDoubleField == null)
-					_SetStaticDoubleField = (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JniEnvironmentSafeHandle_jobject_jstaticFieldID_double));
+					_SetStaticDoubleField = (JniAction_JNIEnvPtr_jobject_IntPtr_double) Marshal.GetDelegateForFunctionPointer (env.SetStaticDoubleField, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_double));
 				return _SetStaticDoubleField;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject _NewString;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject NewString {
+		JniFunc_JNIEnvPtr_IntPtr_int_jobject _NewString;
+		public JniFunc_JNIEnvPtr_IntPtr_int_jobject NewString {
 			get {
 				if (_NewString == null)
-					_NewString = (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_int_jobject));
+					_NewString = (JniFunc_JNIEnvPtr_IntPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewString, typeof (JniFunc_JNIEnvPtr_IntPtr_int_jobject));
 				return _NewString;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _GetStringLength;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int GetStringLength {
+		JniFunc_JNIEnvPtr_jobject_int _GetStringLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetStringLength {
 			get {
 				if (_GetStringLength == null)
-					_GetStringLength = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_GetStringLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _GetStringLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetStringChars;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetStringChars {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetStringChars;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetStringChars {
 			get {
 				if (_GetStringChars == null)
-					_GetStringChars = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetStringChars = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringChars, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetStringChars;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr _ReleaseStringChars;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr ReleaseStringChars {
+		JniAction_JNIEnvPtr_jobject_IntPtr _ReleaseStringChars;
+		public JniAction_JNIEnvPtr_jobject_IntPtr ReleaseStringChars {
 			get {
 				if (_ReleaseStringChars == null)
-					_ReleaseStringChars = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr));
+					_ReleaseStringChars = (JniAction_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringChars, typeof (JniAction_JNIEnvPtr_jobject_IntPtr));
 				return _ReleaseStringChars;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_string_jobject _NewStringUTF;
-		public JniFunc_JniEnvironmentSafeHandle_string_jobject NewStringUTF {
+		JniFunc_JNIEnvPtr_string_jobject _NewStringUTF;
+		public JniFunc_JNIEnvPtr_string_jobject NewStringUTF {
 			get {
 				if (_NewStringUTF == null)
-					_NewStringUTF = (JniFunc_JniEnvironmentSafeHandle_string_jobject) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JniEnvironmentSafeHandle_string_jobject));
+					_NewStringUTF = (JniFunc_JNIEnvPtr_string_jobject) Marshal.GetDelegateForFunctionPointer (env.NewStringUTF, typeof (JniFunc_JNIEnvPtr_string_jobject));
 				return _NewStringUTF;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _GetStringUTFLength;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int GetStringUTFLength {
+		JniFunc_JNIEnvPtr_jobject_int _GetStringUTFLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetStringUTFLength {
 			get {
 				if (_GetStringUTFLength == null)
-					_GetStringUTFLength = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_GetStringUTFLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _GetStringUTFLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string _GetStringUTFChars;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string GetStringUTFChars {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_string _GetStringUTFChars;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_string GetStringUTFChars {
 			get {
 				if (_GetStringUTFChars == null)
-					_GetStringUTFChars = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string));
+					_GetStringUTFChars = (JniFunc_JNIEnvPtr_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFChars, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_string));
 				return _GetStringUTFChars;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_string _ReleaseStringUTFChars;
-		public JniAction_JniEnvironmentSafeHandle_jobject_string ReleaseStringUTFChars {
+		JniAction_JNIEnvPtr_jobject_string _ReleaseStringUTFChars;
+		public JniAction_JNIEnvPtr_jobject_string ReleaseStringUTFChars {
 			get {
 				if (_ReleaseStringUTFChars == null)
-					_ReleaseStringUTFChars = (JniAction_JniEnvironmentSafeHandle_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JniEnvironmentSafeHandle_jobject_string));
+					_ReleaseStringUTFChars = (JniAction_JNIEnvPtr_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringUTFChars, typeof (JniAction_JNIEnvPtr_jobject_string));
 				return _ReleaseStringUTFChars;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _GetArrayLength;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int GetArrayLength {
+		JniFunc_JNIEnvPtr_jobject_int _GetArrayLength;
+		public JniFunc_JNIEnvPtr_jobject_int GetArrayLength {
 			get {
 				if (_GetArrayLength == null)
-					_GetArrayLength = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_GetArrayLength = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.GetArrayLength, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _GetArrayLength;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject_jobject_jobject _NewObjectArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject_jobject_jobject NewObjectArray {
+		JniFunc_JNIEnvPtr_int_jobject_jobject_jobject _NewObjectArray;
+		public JniFunc_JNIEnvPtr_int_jobject_jobject_jobject NewObjectArray {
 			get {
 				if (_NewObjectArray == null)
-					_NewObjectArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject_jobject_jobject));
+					_NewObjectArray = (JniFunc_JNIEnvPtr_int_jobject_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewObjectArray, typeof (JniFunc_JNIEnvPtr_int_jobject_jobject_jobject));
 				return _NewObjectArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int_jobject _GetObjectArrayElement;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int_jobject GetObjectArrayElement {
+		JniFunc_JNIEnvPtr_jobject_int_jobject _GetObjectArrayElement;
+		public JniFunc_JNIEnvPtr_jobject_int_jobject GetObjectArrayElement {
 			get {
 				if (_GetObjectArrayElement == null)
-					_GetObjectArrayElement = (JniFunc_JniEnvironmentSafeHandle_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int_jobject));
+					_GetObjectArrayElement = (JniFunc_JNIEnvPtr_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.GetObjectArrayElement, typeof (JniFunc_JNIEnvPtr_jobject_int_jobject));
 				return _GetObjectArrayElement;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_jobject _SetObjectArrayElement;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_jobject SetObjectArrayElement {
+		JniAction_JNIEnvPtr_jobject_int_jobject _SetObjectArrayElement;
+		public JniAction_JNIEnvPtr_jobject_int_jobject SetObjectArrayElement {
 			get {
 				if (_SetObjectArrayElement == null)
-					_SetObjectArrayElement = (JniAction_JniEnvironmentSafeHandle_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_jobject));
+					_SetObjectArrayElement = (JniAction_JNIEnvPtr_jobject_int_jobject) Marshal.GetDelegateForFunctionPointer (env.SetObjectArrayElement, typeof (JniAction_JNIEnvPtr_jobject_int_jobject));
 				return _SetObjectArrayElement;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewBooleanArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewBooleanArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewBooleanArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewBooleanArray {
 			get {
 				if (_NewBooleanArray == null)
-					_NewBooleanArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewBooleanArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewBooleanArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewBooleanArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewByteArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewByteArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewByteArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewByteArray {
 			get {
 				if (_NewByteArray == null)
-					_NewByteArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewByteArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewByteArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewByteArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewCharArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewCharArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewCharArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewCharArray {
 			get {
 				if (_NewCharArray == null)
-					_NewCharArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewCharArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewCharArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewCharArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewShortArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewShortArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewShortArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewShortArray {
 			get {
 				if (_NewShortArray == null)
-					_NewShortArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewShortArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewShortArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewShortArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewIntArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewIntArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewIntArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewIntArray {
 			get {
 				if (_NewIntArray == null)
-					_NewIntArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewIntArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewIntArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewIntArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewLongArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewLongArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewLongArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewLongArray {
 			get {
 				if (_NewLongArray == null)
-					_NewLongArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewLongArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewLongArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewLongArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewFloatArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewFloatArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewFloatArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewFloatArray {
 			get {
 				if (_NewFloatArray == null)
-					_NewFloatArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewFloatArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewFloatArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewFloatArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_int_jobject _NewDoubleArray;
-		public JniFunc_JniEnvironmentSafeHandle_int_jobject NewDoubleArray {
+		JniFunc_JNIEnvPtr_int_jobject _NewDoubleArray;
+		public JniFunc_JNIEnvPtr_int_jobject NewDoubleArray {
 			get {
 				if (_NewDoubleArray == null)
-					_NewDoubleArray = (JniFunc_JniEnvironmentSafeHandle_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JniEnvironmentSafeHandle_int_jobject));
+					_NewDoubleArray = (JniFunc_JNIEnvPtr_int_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDoubleArray, typeof (JniFunc_JNIEnvPtr_int_jobject));
 				return _NewDoubleArray;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetBooleanArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetBooleanArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetBooleanArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetBooleanArrayElements {
 			get {
 				if (_GetBooleanArrayElements == null)
-					_GetBooleanArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetBooleanArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetBooleanArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetByteArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetByteArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetByteArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetByteArrayElements {
 			get {
 				if (_GetByteArrayElements == null)
-					_GetByteArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetByteArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetByteArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetCharArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetCharArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetCharArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetCharArrayElements {
 			get {
 				if (_GetCharArrayElements == null)
-					_GetCharArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetCharArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetCharArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetShortArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetShortArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetShortArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetShortArrayElements {
 			get {
 				if (_GetShortArrayElements == null)
-					_GetShortArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetShortArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetShortArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetIntArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetIntArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetIntArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetIntArrayElements {
 			get {
 				if (_GetIntArrayElements == null)
-					_GetIntArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetIntArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetIntArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetLongArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetLongArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetLongArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetLongArrayElements {
 			get {
 				if (_GetLongArrayElements == null)
-					_GetLongArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetLongArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetLongArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetFloatArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetFloatArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetFloatArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetFloatArrayElements {
 			get {
 				if (_GetFloatArrayElements == null)
-					_GetFloatArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetFloatArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetFloatArrayElements;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetDoubleArrayElements;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetDoubleArrayElements {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetDoubleArrayElements;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetDoubleArrayElements {
 			get {
 				if (_GetDoubleArrayElements == null)
-					_GetDoubleArrayElements = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetDoubleArrayElements = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayElements, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetDoubleArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseBooleanArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseBooleanArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseBooleanArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseBooleanArrayElements {
 			get {
 				if (_ReleaseBooleanArrayElements == null)
-					_ReleaseBooleanArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseBooleanArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseBooleanArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseBooleanArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseByteArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseByteArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseByteArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseByteArrayElements {
 			get {
 				if (_ReleaseByteArrayElements == null)
-					_ReleaseByteArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseByteArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseByteArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseByteArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseCharArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseCharArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseCharArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseCharArrayElements {
 			get {
 				if (_ReleaseCharArrayElements == null)
-					_ReleaseCharArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseCharArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseCharArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseCharArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseShortArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseShortArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseShortArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseShortArrayElements {
 			get {
 				if (_ReleaseShortArrayElements == null)
-					_ReleaseShortArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseShortArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseShortArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseShortArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseIntArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseIntArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseIntArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseIntArrayElements {
 			get {
 				if (_ReleaseIntArrayElements == null)
-					_ReleaseIntArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseIntArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseIntArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseIntArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseLongArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseLongArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseLongArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseLongArrayElements {
 			get {
 				if (_ReleaseLongArrayElements == null)
-					_ReleaseLongArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseLongArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseLongArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseLongArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseFloatArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseFloatArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseFloatArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseFloatArrayElements {
 			get {
 				if (_ReleaseFloatArrayElements == null)
-					_ReleaseFloatArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseFloatArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseFloatArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseFloatArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleaseDoubleArrayElements;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleaseDoubleArrayElements {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleaseDoubleArrayElements;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleaseDoubleArrayElements {
 			get {
 				if (_ReleaseDoubleArrayElements == null)
-					_ReleaseDoubleArrayElements = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleaseDoubleArrayElements = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleaseDoubleArrayElements, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleaseDoubleArrayElements;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetBooleanArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetBooleanArrayRegion {
 			get {
 				if (_GetBooleanArrayRegion == null)
-					_GetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetBooleanArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetBooleanArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetByteArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetByteArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetByteArrayRegion {
 			get {
 				if (_GetByteArrayRegion == null)
-					_GetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetByteArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetByteArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetByteArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetCharArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetCharArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetCharArrayRegion {
 			get {
 				if (_GetCharArrayRegion == null)
-					_GetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetCharArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetCharArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetCharArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetShortArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetShortArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetShortArrayRegion {
 			get {
 				if (_GetShortArrayRegion == null)
-					_GetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetShortArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetShortArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetShortArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetIntArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetIntArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetIntArrayRegion {
 			get {
 				if (_GetIntArrayRegion == null)
-					_GetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetIntArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetIntArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetIntArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetLongArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetLongArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetLongArrayRegion {
 			get {
 				if (_GetLongArrayRegion == null)
-					_GetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetLongArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetLongArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetLongArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetFloatArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetFloatArrayRegion {
 			get {
 				if (_GetFloatArrayRegion == null)
-					_GetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetFloatArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetFloatArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetDoubleArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetDoubleArrayRegion {
 			get {
 				if (_GetDoubleArrayRegion == null)
-					_GetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetDoubleArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetDoubleArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetBooleanArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetBooleanArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetBooleanArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetBooleanArrayRegion {
 			get {
 				if (_SetBooleanArrayRegion == null)
-					_SetBooleanArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetBooleanArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetBooleanArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetBooleanArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetByteArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetByteArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetByteArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetByteArrayRegion {
 			get {
 				if (_SetByteArrayRegion == null)
-					_SetByteArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetByteArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetByteArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetByteArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetCharArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetCharArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetCharArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetCharArrayRegion {
 			get {
 				if (_SetCharArrayRegion == null)
-					_SetCharArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetCharArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetCharArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetCharArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetShortArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetShortArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetShortArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetShortArrayRegion {
 			get {
 				if (_SetShortArrayRegion == null)
-					_SetShortArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetShortArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetShortArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetShortArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetIntArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetIntArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetIntArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetIntArrayRegion {
 			get {
 				if (_SetIntArrayRegion == null)
-					_SetIntArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetIntArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetIntArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetIntArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetLongArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetLongArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetLongArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetLongArrayRegion {
 			get {
 				if (_SetLongArrayRegion == null)
-					_SetLongArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetLongArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetLongArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetLongArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetFloatArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetFloatArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetFloatArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetFloatArrayRegion {
 			get {
 				if (_SetFloatArrayRegion == null)
-					_SetFloatArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetFloatArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetFloatArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetFloatArrayRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _SetDoubleArrayRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr SetDoubleArrayRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _SetDoubleArrayRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr SetDoubleArrayRegion {
 			get {
 				if (_SetDoubleArrayRegion == null)
-					_SetDoubleArrayRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_SetDoubleArrayRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.SetDoubleArrayRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _SetDoubleArrayRegion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_JniNativeMethodRegistrationArray_int_int RegisterNatives {
+		JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int _RegisterNatives;
+		public JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int RegisterNatives {
 			get {
 				if (_RegisterNatives == null)
-					_RegisterNatives = (JniFunc_JniEnvironmentSafeHandle_jobject_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_JniNativeMethodRegistrationArray_int_int));
+					_RegisterNatives = (JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int) Marshal.GetDelegateForFunctionPointer (env.RegisterNatives, typeof (JniFunc_JNIEnvPtr_jobject_JniNativeMethodRegistrationArray_int_int));
 				return _RegisterNatives;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _UnregisterNatives;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int UnregisterNatives {
+		JniFunc_JNIEnvPtr_jobject_int _UnregisterNatives;
+		public JniFunc_JNIEnvPtr_jobject_int UnregisterNatives {
 			get {
 				if (_UnregisterNatives == null)
-					_UnregisterNatives = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_UnregisterNatives = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.UnregisterNatives, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _UnregisterNatives;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _MonitorEnter;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int MonitorEnter {
+		JniFunc_JNIEnvPtr_jobject_int _MonitorEnter;
+		public JniFunc_JNIEnvPtr_jobject_int MonitorEnter {
 			get {
 				if (_MonitorEnter == null)
-					_MonitorEnter = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_MonitorEnter = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorEnter, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _MonitorEnter;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_int _MonitorExit;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_int MonitorExit {
+		JniFunc_JNIEnvPtr_jobject_int _MonitorExit;
+		public JniFunc_JNIEnvPtr_jobject_int MonitorExit {
 			get {
 				if (_MonitorExit == null)
-					_MonitorExit = (JniFunc_JniEnvironmentSafeHandle_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_int));
+					_MonitorExit = (JniFunc_JNIEnvPtr_jobject_int) Marshal.GetDelegateForFunctionPointer (env.MonitorExit, typeof (JniFunc_JNIEnvPtr_jobject_int));
 				return _MonitorExit;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_outIntPtr_int _GetJavaVM;
-		public JniFunc_JniEnvironmentSafeHandle_outIntPtr_int GetJavaVM {
+		JniFunc_JNIEnvPtr_outIntPtr_int _GetJavaVM;
+		public JniFunc_JNIEnvPtr_outIntPtr_int GetJavaVM {
 			get {
 				if (_GetJavaVM == null)
-					_GetJavaVM = (JniFunc_JniEnvironmentSafeHandle_outIntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JniEnvironmentSafeHandle_outIntPtr_int));
+					_GetJavaVM = (JniFunc_JNIEnvPtr_outIntPtr_int) Marshal.GetDelegateForFunctionPointer (env.GetJavaVM, typeof (JniFunc_JNIEnvPtr_outIntPtr_int));
 				return _GetJavaVM;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetStringRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetStringRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetStringRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetStringRegion {
 			get {
 				if (_GetStringRegion == null)
-					_GetStringRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetStringRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetStringRegion;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr _GetStringUTFRegion;
-		public JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr GetStringUTFRegion {
+		JniAction_JNIEnvPtr_jobject_int_int_IntPtr _GetStringUTFRegion;
+		public JniAction_JNIEnvPtr_jobject_int_int_IntPtr GetStringUTFRegion {
 			get {
 				if (_GetStringUTFRegion == null)
-					_GetStringUTFRegion = (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JniEnvironmentSafeHandle_jobject_int_int_IntPtr));
+					_GetStringUTFRegion = (JniAction_JNIEnvPtr_jobject_int_int_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetStringUTFRegion, typeof (JniAction_JNIEnvPtr_jobject_int_int_IntPtr));
 				return _GetStringUTFRegion;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr _GetPrimitiveArrayCritical;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr GetPrimitiveArrayCritical {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr _GetPrimitiveArrayCritical;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr GetPrimitiveArrayCritical {
 			get {
 				if (_GetPrimitiveArrayCritical == null)
-					_GetPrimitiveArrayCritical = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_IntPtr));
+					_GetPrimitiveArrayCritical = (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetPrimitiveArrayCritical, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_IntPtr));
 				return _GetPrimitiveArrayCritical;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int _ReleasePrimitiveArrayCritical;
-		public JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int ReleasePrimitiveArrayCritical {
+		JniAction_JNIEnvPtr_jobject_IntPtr_int _ReleasePrimitiveArrayCritical;
+		public JniAction_JNIEnvPtr_jobject_IntPtr_int ReleasePrimitiveArrayCritical {
 			get {
 				if (_ReleasePrimitiveArrayCritical == null)
-					_ReleasePrimitiveArrayCritical = (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JniEnvironmentSafeHandle_jobject_IntPtr_int));
+					_ReleasePrimitiveArrayCritical = (JniAction_JNIEnvPtr_jobject_IntPtr_int) Marshal.GetDelegateForFunctionPointer (env.ReleasePrimitiveArrayCritical, typeof (JniAction_JNIEnvPtr_jobject_IntPtr_int));
 				return _ReleasePrimitiveArrayCritical;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string _GetStringCritical;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string GetStringCritical {
+		JniFunc_JNIEnvPtr_jobject_IntPtr_string _GetStringCritical;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr_string GetStringCritical {
 			get {
 				if (_GetStringCritical == null)
-					_GetStringCritical = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr_string));
+					_GetStringCritical = (JniFunc_JNIEnvPtr_jobject_IntPtr_string) Marshal.GetDelegateForFunctionPointer (env.GetStringCritical, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr_string));
 				return _GetStringCritical;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_jobject_string _ReleaseStringCritical;
-		public JniAction_JniEnvironmentSafeHandle_jobject_string ReleaseStringCritical {
+		JniAction_JNIEnvPtr_jobject_string _ReleaseStringCritical;
+		public JniAction_JNIEnvPtr_jobject_string ReleaseStringCritical {
 			get {
 				if (_ReleaseStringCritical == null)
-					_ReleaseStringCritical = (JniAction_JniEnvironmentSafeHandle_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JniEnvironmentSafeHandle_jobject_string));
+					_ReleaseStringCritical = (JniAction_JNIEnvPtr_jobject_string) Marshal.GetDelegateForFunctionPointer (env.ReleaseStringCritical, typeof (JniAction_JNIEnvPtr_jobject_string));
 				return _ReleaseStringCritical;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_jobject _NewWeakGlobalRef;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_jobject NewWeakGlobalRef {
+		JniFunc_JNIEnvPtr_jobject_jobject _NewWeakGlobalRef;
+		public JniFunc_JNIEnvPtr_jobject_jobject NewWeakGlobalRef {
 			get {
 				if (_NewWeakGlobalRef == null)
-					_NewWeakGlobalRef = (JniFunc_JniEnvironmentSafeHandle_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_jobject));
+					_NewWeakGlobalRef = (JniFunc_JNIEnvPtr_jobject_jobject) Marshal.GetDelegateForFunctionPointer (env.NewWeakGlobalRef, typeof (JniFunc_JNIEnvPtr_jobject_jobject));
 				return _NewWeakGlobalRef;
 			}
 		}
 
-		JniAction_JniEnvironmentSafeHandle_IntPtr _DeleteWeakGlobalRef;
-		public JniAction_JniEnvironmentSafeHandle_IntPtr DeleteWeakGlobalRef {
+		JniAction_JNIEnvPtr_IntPtr _DeleteWeakGlobalRef;
+		public JniAction_JNIEnvPtr_IntPtr DeleteWeakGlobalRef {
 			get {
 				if (_DeleteWeakGlobalRef == null)
-					_DeleteWeakGlobalRef = (JniAction_JniEnvironmentSafeHandle_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JniEnvironmentSafeHandle_IntPtr));
+					_DeleteWeakGlobalRef = (JniAction_JNIEnvPtr_IntPtr) Marshal.GetDelegateForFunctionPointer (env.DeleteWeakGlobalRef, typeof (JniAction_JNIEnvPtr_IntPtr));
 				return _DeleteWeakGlobalRef;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_bool _ExceptionCheck;
-		public JniFunc_JniEnvironmentSafeHandle_bool ExceptionCheck {
+		JniFunc_JNIEnvPtr_bool _ExceptionCheck;
+		public JniFunc_JNIEnvPtr_bool ExceptionCheck {
 			get {
 				if (_ExceptionCheck == null)
-					_ExceptionCheck = (JniFunc_JniEnvironmentSafeHandle_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JniEnvironmentSafeHandle_bool));
+					_ExceptionCheck = (JniFunc_JNIEnvPtr_bool) Marshal.GetDelegateForFunctionPointer (env.ExceptionCheck, typeof (JniFunc_JNIEnvPtr_bool));
 				return _ExceptionCheck;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject _NewDirectByteBuffer;
-		public JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject NewDirectByteBuffer {
+		JniFunc_JNIEnvPtr_IntPtr_long_jobject _NewDirectByteBuffer;
+		public JniFunc_JNIEnvPtr_IntPtr_long_jobject NewDirectByteBuffer {
 			get {
 				if (_NewDirectByteBuffer == null)
-					_NewDirectByteBuffer = (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JniEnvironmentSafeHandle_IntPtr_long_jobject));
+					_NewDirectByteBuffer = (JniFunc_JNIEnvPtr_IntPtr_long_jobject) Marshal.GetDelegateForFunctionPointer (env.NewDirectByteBuffer, typeof (JniFunc_JNIEnvPtr_IntPtr_long_jobject));
 				return _NewDirectByteBuffer;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr _GetDirectBufferAddress;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr GetDirectBufferAddress {
+		JniFunc_JNIEnvPtr_jobject_IntPtr _GetDirectBufferAddress;
+		public JniFunc_JNIEnvPtr_jobject_IntPtr GetDirectBufferAddress {
 			get {
 				if (_GetDirectBufferAddress == null)
-					_GetDirectBufferAddress = (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_IntPtr));
+					_GetDirectBufferAddress = (JniFunc_JNIEnvPtr_jobject_IntPtr) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferAddress, typeof (JniFunc_JNIEnvPtr_jobject_IntPtr));
 				return _GetDirectBufferAddress;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_long _GetDirectBufferCapacity;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_long GetDirectBufferCapacity {
+		JniFunc_JNIEnvPtr_jobject_long _GetDirectBufferCapacity;
+		public JniFunc_JNIEnvPtr_jobject_long GetDirectBufferCapacity {
 			get {
 				if (_GetDirectBufferCapacity == null)
-					_GetDirectBufferCapacity = (JniFunc_JniEnvironmentSafeHandle_jobject_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_long));
+					_GetDirectBufferCapacity = (JniFunc_JNIEnvPtr_jobject_long) Marshal.GetDelegateForFunctionPointer (env.GetDirectBufferCapacity, typeof (JniFunc_JNIEnvPtr_jobject_long));
 				return _GetDirectBufferCapacity;
 			}
 		}
 
-		JniFunc_JniEnvironmentSafeHandle_jobject_JniObjectReferenceType _GetObjectRefType;
-		public JniFunc_JniEnvironmentSafeHandle_jobject_JniObjectReferenceType GetObjectRefType {
+		JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType _GetObjectRefType;
+		public JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType GetObjectRefType {
 			get {
 				if (_GetObjectRefType == null)
-					_GetObjectRefType = (JniFunc_JniEnvironmentSafeHandle_jobject_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JniEnvironmentSafeHandle_jobject_JniObjectReferenceType));
+					_GetObjectRefType = (JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType) Marshal.GetDelegateForFunctionPointer (env.GetObjectRefType, typeof (JniFunc_JNIEnvPtr_jobject_JniObjectReferenceType));
 				return _GetObjectRefType;
 			}
 		}
 	}
 }
-#endif // FEATURE_HANDLES_ARE_INTPTRS
+#endif  // FEATURE_HANDLES_ARE_XA_INTPTRS
diff --git a/tests/invocation-overhead/test-overheads-xa.exe.config b/tests/invocation-overhead/test-overheads-xa.exe.config
deleted file mode 100644
index 3d9277004..000000000
--- a/tests/invocation-overhead/test-overheads-xa.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-  <dllmap dll="jvm.dll" os="osx" target="/System/Library/Frameworks/JavaVM.framework/JavaVM"/>
-</configuration>
diff --git a/tests/invocation-overhead/test-overheads.cs b/tests/invocation-overhead/test-overheads.cs
index eceff7e5c..b0bdfb516 100644
--- a/tests/invocation-overhead/test-overheads.cs
+++ b/tests/invocation-overhead/test-overheads.cs
@@ -2,11 +2,11 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Java.Interop;
-using Java.Interop.SafeHandles;
-using Java.Interop.IntPtrs;
 
-using SafeEnv = Java.Interop.SafeHandles.JniEnvironment;
-using IntPtrEnv = Java.Interop.IntPtrs.JniEnvironment;
+using SafeEnv       = Java.Interop.SafeHandles.JniEnvironment;
+using JIIntPtrEnv   = Java.Interop.JIIntPtrs.JniEnvironment;
+using PinvokeEnv    = Java.Interop.JIPinvokes.JniEnvironment;
+using XAIntPtrEnv   = Java.Interop.XAIntPtrs.JniEnvironment;
 
 namespace Java.Interop {
 	public enum JniObjectReferenceType {
@@ -18,11 +18,21 @@ public enum JniObjectReferenceType {
 
 	public struct JniObjectReference
 	{
+		public  JniReferenceSafeHandle      SafeHandle  {get; private set;}
 		public  IntPtr                      Handle  {get; private set;}
 		public  JniObjectReferenceType      Type    {get; private set;}
 
+
+		public JniObjectReference (JniReferenceSafeHandle handle, JniObjectReferenceType type = JniObjectReferenceType.Invalid)
+		{
+			SafeHandle = handle;
+			Handle  = IntPtr.Zero;
+			Type    = type;
+		}
+
 		public JniObjectReference (IntPtr handle, JniObjectReferenceType type = JniObjectReferenceType.Invalid)
 		{
+			SafeHandle = null;
 			Handle  = handle;
 			Type    = type;
 		}
@@ -91,17 +101,19 @@ public JValue (double value)
 			this = new JValue ();
 			d = value;
 		}
-#if XA
 		public JValue (IntPtr value)
 		{
 			this = new JValue ();
 			l = value;
 		}
-#endif
 		public JValue (JniObjectReference value)
 		{
 			this = new JValue ();
-			l = value.Handle;
+			var sh = value.SafeHandle;
+			if (sh != null)
+				l = value.SafeHandle.DangerousGetHandle ();
+			else
+				l = value.Handle;
 		}
 
 		public JValue (JniReferenceSafeHandle value)
@@ -116,76 +128,58 @@ public override string ToString ()
 					z, b, c, s, i, f, d, l.ToString ("x"));
 		}
 	}
-	public abstract class JniFieldID : SafeHandle
+	public abstract class JniFieldInfo
 	{
-		internal JniFieldID ()
-			: base (IntPtr.Zero, true)
-		{
-		}
+		public IntPtr ID;
 
-		protected override bool ReleaseHandle ()
+		protected JniFieldInfo (IntPtr id)
 		{
-			Console.WriteLine ("# {0}.ReleaseHandle()", GetType ().FullName);
-			return true;
-		}
-
-		public override bool IsInvalid {
-			get {
-				return handle == IntPtr.Zero;
-			}
+			ID = id;
 		}
 
 		public override string ToString ()
 		{
-			return string.Format ("{0}(0x{1})", GetType ().FullName, handle.ToString ("x"));
+			return string.Format ("{0}(0x{1})", GetType ().FullName, ID.ToString ("x"));
 		}
 	}
 
-	public sealed class JniStaticFieldID : JniFieldID
+	public sealed class JniStaticFieldInfo : JniFieldInfo
 	{
-		JniStaticFieldID ()
+		public JniStaticFieldInfo (IntPtr id)
+			: base (id)
 		{
 		}
 	}
-	public sealed class JniInstanceFieldID : JniFieldID
+	public sealed class JniInstanceFieldInfo : JniFieldInfo
 	{
-		JniInstanceFieldID ()
+		public JniInstanceFieldInfo (IntPtr id)
+			: base (id)
 		{
 		}
 	}
-	public abstract class JniMethodID : SafeHandle
+	public abstract class JniMethodInfo
 	{
-		internal JniMethodID ()
-			: base (IntPtr.Zero, true)
+		public IntPtr ID;
+		protected JniMethodInfo (IntPtr id)
 		{
+			ID = id;
 		}
-
-		protected override bool ReleaseHandle ()
-		{
-			Console.WriteLine ("# {0}.ReleaseHandle()", GetType ().FullName);
-			return true;
-		}
-
-		public override bool IsInvalid {
-			get {
-				return handle == IntPtr.Zero;
-			}
-		}
-
 		public override string ToString ()
 		{
-			return string.Format ("{0}(0x{1})", GetType ().FullName, handle.ToString ("x"));
+			return string.Format ("{0}(0x{1})", GetType ().FullName, ID.ToString ("x"));
 		}
 	}
-	public sealed class JniStaticMethodID : JniMethodID
+	public sealed class JniStaticMethodInfo : JniMethodInfo
 	{
-		JniStaticMethodID ()
+		public JniStaticMethodInfo (IntPtr id)
+			: base (id)
 		{
 		}
 	}
-	public sealed class JniInstanceMethodID : JniMethodID
+	public sealed class JniInstanceMethodInfo : JniMethodInfo
 	{
-		JniInstanceMethodID ()
+		public JniInstanceMethodInfo (IntPtr id)
+			: base (id)
 		{
 		}
 	}
@@ -223,7 +217,7 @@ public JniObjectReferenceType ReferenceType {
 			get {
 				if (IsInvalid)
 					throw new ObjectDisposedException (GetType ().FullName);
-				return SafeHandles.JniEnvironment.Handles.GetObjectRefType (this);
+				return SafeHandles.JniEnvironment.References.GetObjectRefType (new JniObjectReference (this));
 			}
 		}
 
@@ -247,8 +241,7 @@ internal JniLocalReference ()
 
 		protected override bool ReleaseHandle ()
 		{
-			Console.WriteLine ("# {0}.ReleaseHandle()", GetType ().FullName);
-			SafeHandles.JniEnvironment.Handles.DeleteLocalRef (handle);
+			SafeHandles.JniEnvironment.References.DeleteLocalRef (handle);
 			return true;
 		}
 	}
@@ -256,7 +249,7 @@ public class JniWeakGlobalReference : JniReferenceSafeHandle {
 		protected override bool ReleaseHandle ()
 		{
 			Console.WriteLine ("# {0}.ReleaseHandle()", GetType ().FullName);
-			SafeHandles.JniEnvironment.Handles.DeleteWeakGlobalRef (handle);
+			SafeHandles.JniEnvironment.References.DeleteWeakGlobalRef (handle);
 			return true;
 		}
 	}
@@ -264,7 +257,7 @@ public class JniGlobalReference : JniReferenceSafeHandle {
 		protected override bool ReleaseHandle ()
 		{
 			Console.WriteLine ("# {0}.ReleaseHandle()", GetType ().FullName);
-			SafeHandles.JniEnvironment.Handles.DeleteGlobalRef (handle);
+			SafeHandles.JniEnvironment.References.DeleteGlobalRef (handle);
 			return true;
 		}
 	}
@@ -359,11 +352,11 @@ public partial class JniEnvironment {
 		public static JniEnvironment Current;
 
 		internal JniEnvironmentInvoker Invoker;
-		public JniEnvironmentSafeHandle SafeHandle;
+		public IntPtr EnvironmentPointer;
 
 		public unsafe JniEnvironment (IntPtr v) {
 			Current = this;
-			SafeHandle = new JniEnvironmentSafeHandle (v);
+			EnvironmentPointer = v;
 			IntPtr p = Marshal.ReadIntPtr (v);
 			Invoker = new JniEnvironmentInvoker ((JniNativeInterfaceStruct*) p);
 		}
@@ -372,27 +365,29 @@ internal void LogCreateLocalRef (JniLocalReference value)
 		}
 		public Exception GetExceptionForLastThrowable ()
 		{
-			var v = SafeEnv.Errors.ExceptionOccurred ();
-			if (v == null || v.IsInvalid)
+			var v = SafeEnv.Exceptions.ExceptionOccurred ();
+			if (v.SafeHandle == null || v.SafeHandle.IsInvalid || v.SafeHandle.IsClosed)
 				return null;
-			SafeEnv.Errors.ExceptionClear ();
-			LogCreateLocalRef (v);
-			v.Dispose ();
+			Console.WriteLine ("exception?!");
+			SafeEnv.Exceptions.ExceptionDescribe();
+			SafeEnv.Exceptions.ExceptionClear ();
+			LogCreateLocalRef ((JniLocalReference) v.SafeHandle);
+			v.SafeHandle.Dispose ();
 			return new Exception ("yada yada yada");
 		}
 	}
 }
 
-namespace Java.Interop.IntPtrs {
+namespace Java.Interop.JIIntPtrs {
 	public partial class JniEnvironment {
 		public static JniEnvironment Current;
 
 		internal JniEnvironmentInvoker Invoker;
-		public IntPtr SafeHandle;
+		public IntPtr EnvironmentPointer;
 
 		public unsafe JniEnvironment (IntPtr v) {
 			Current = this;
-			SafeHandle = v;
+			EnvironmentPointer = v;
 			IntPtr p = Marshal.ReadIntPtr (v);
 			Invoker = new JniEnvironmentInvoker ((JniNativeInterfaceStruct*) p);
 		}
@@ -401,22 +396,85 @@ internal void LogCreateLocalRef (IntPtr value)
 		}
 		public Exception GetExceptionForLastThrowable ()
 		{
-			var v = IntPtrEnv.Errors.ExceptionOccurred ();
-			#if XA
-			var h = v;
-			#else
+			var v = JIIntPtrEnv.Exceptions.ExceptionOccurred ();
 			var h = v.Handle;
-			#endif
 			if (h == IntPtr.Zero)
 				return null;
-			SafeEnv.Errors.ExceptionClear ();
+			JIIntPtrEnv.Exceptions.ExceptionClear ();
 			LogCreateLocalRef (h);
-			IntPtrEnv.Handles.DeleteLocalRef (h);
+			JIIntPtrEnv.References.DeleteLocalRef (h);
 			return new Exception ("yada yada yada");
 		}
 	}
 }
 
+namespace Java.Interop.JIPinvokes {
+	public partial class JniEnvironment {
+		public static JniEnvironment Current;
+
+		public IntPtr EnvironmentPointer;
+
+		public unsafe JniEnvironment (IntPtr v) {
+			Current = this;
+			EnvironmentPointer = v;
+			IntPtr p = Marshal.ReadIntPtr (v);
+		}
+		internal void LogCreateLocalRef (IntPtr value)
+		{
+		}
+		public Exception GetExceptionForLastThrowable (IntPtr h)
+		{
+			if (h == IntPtr.Zero)
+				return null;
+			PinvokeEnv.Exceptions.ExceptionClear ();
+			LogCreateLocalRef (h);
+			var r = new JniObjectReference (h, JniObjectReferenceType.Local);
+			PinvokeEnv.References.DeleteLocalRef (r.Handle);
+			return new Exception ("yada yada yada");
+		}
+		public Exception GetExceptionForLastThrowable ()
+		{
+			var v = JIIntPtrEnv.Exceptions.ExceptionOccurred ();
+			var h = v.Handle;
+			if (h == IntPtr.Zero)
+				return null;
+			SafeEnv.Exceptions.ExceptionClear ();
+			LogCreateLocalRef (h);
+			JIIntPtrEnv.References.DeleteLocalRef (h);
+			return new Exception ("yada yada yada");
+		}
+	}
+}
+namespace Java.Interop.XAIntPtrs {
+	public partial class JniEnvironment {
+		public static JniEnvironment Current;
+
+		internal JniEnvironmentInvoker Invoker;
+		public IntPtr EnvironmentPointer;
+
+		public unsafe JniEnvironment (IntPtr v) {
+			Current = this;
+			EnvironmentPointer = v;
+			IntPtr p = Marshal.ReadIntPtr (v);
+			Invoker = new JniEnvironmentInvoker ((JniNativeInterfaceStruct*) p);
+		}
+		internal void LogCreateLocalRef (IntPtr value)
+		{
+		}
+		public Exception GetExceptionForLastThrowable ()
+		{
+			var h = XAIntPtrEnv.Exceptions.ExceptionOccurred ();
+			if (h == IntPtr.Zero)
+				return null;
+			XAIntPtrEnv.Exceptions.ExceptionClear ();
+			LogCreateLocalRef (h);
+			XAIntPtrEnv.References.DeleteLocalRef (h);
+			return new Exception ("yada yada yada");
+		}
+	}
+}
+
+
 class App {
 	const string LibraryName = "jvm.dll";
 
@@ -427,11 +485,11 @@ public static void Main ()
 	{
 		IntPtr _jvm, _env;
 		CreateJavaVM (out _jvm, out _env);
-		Console.WriteLine ("# _jvm: {0}", _jvm.ToString ("x"));
-		Console.WriteLine ("# _env: {0}", _env.ToString ("x"));
 
 		SafeTiming (_env);
-		IntPtrTiming (_env);
+		JIIntPtrTiming (_env);
+		JIPinvokeTiming (_env);
+		XAIntPtrTiming (_env);
 	}
 
 	static void CreateJavaVM (out IntPtr jvm, out IntPtr jnienv)
@@ -452,7 +510,7 @@ static unsafe void SafeTiming (IntPtr _env)
 	{
 		var se = new SafeEnv (_env);
 		var Arrays_class = SafeEnv.Types.FindClass ("java/util/Arrays");
-		var Arrays_binarySearch = SafeEnv.Members.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
+		var Arrays_binarySearch = SafeEnv.StaticMethods.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
 		var intArray = SafeEnv.Arrays.NewIntArray (3);
 		fixed (int* p = new int[]{1,2,3})
 			SafeEnv.Arrays.SetIntArrayRegion (intArray, 0, 3, (IntPtr) p);
@@ -462,12 +520,10 @@ static unsafe void SafeTiming (IntPtr _env)
 		args [0] = new JValue (intArray);
 		args [1] = new JValue (2);
 		for (int i = 0; i < C; ++i) {
-			if (SafeEnv.Current.SafeHandle.DangerousGetHandle () == IntPtr.Zero)
-				Console.WriteLine("wat?!");
-			int r = SafeEnv.Members.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
+			int r = SafeEnv.StaticMethods.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
 		}
 		t.Stop ();
-		Console.WriteLine ("# SafeHandle timing: {0}", t.Elapsed);
+		Console.WriteLine ("# {0} timing: {1}", nameof (SafeTiming), t.Elapsed);
 		Console.WriteLine ("#\tAverage Invocation: {0}ms", t.Elapsed.TotalMilliseconds / C);
 		GC.KeepAlive (se);
 		GC.KeepAlive (intArray);
@@ -475,24 +531,66 @@ static unsafe void SafeTiming (IntPtr _env)
 		GC.KeepAlive (Arrays_binarySearch);
 	}
 
-	static unsafe void IntPtrTiming (IntPtr _env)
+	static unsafe void JIIntPtrTiming (IntPtr _env)
+	{
+		var pe = new JIIntPtrEnv (_env);
+		var Arrays_class = JIIntPtrEnv.Types.FindClass ("java/util/Arrays");
+		var Arrays_binarySearch = JIIntPtrEnv.StaticMethods.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
+		var intArray = JIIntPtrEnv.Arrays.NewIntArray (3);
+		fixed (int* p = new int[]{1,2,3})
+			JIIntPtrEnv.Arrays.SetIntArrayRegion (intArray, 0, 3, (IntPtr) p);
+
+		var t = Stopwatch.StartNew ();
+		var args = stackalloc JValue [2];
+		args [0] = new JValue (intArray);
+		args [1] = new JValue (2);
+		for (int i = 0; i < C; ++i) {
+			int r = JIIntPtrEnv.StaticMethods.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
+		}
+		t.Stop ();
+		Console.WriteLine ("# {0} timing: {1}", nameof (JIIntPtrTiming), t.Elapsed);
+		Console.WriteLine ("#\tAverage Invocation: {0}ms", t.Elapsed.TotalMilliseconds / C);
+	}
+
+	static unsafe void JIPinvokeTiming (IntPtr _env)
+	{
+		var pe = new PinvokeEnv (_env);
+		var Arrays_class = PinvokeEnv.Types.FindClass ("java/util/Arrays");
+		var Arrays_binarySearch = PinvokeEnv.StaticMethods.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
+		var intArray = PinvokeEnv.Arrays.NewIntArray (3);
+		fixed (int* p = new int[]{1,2,3})
+			PinvokeEnv.Arrays.SetIntArrayRegion (intArray, 0, 3, (IntPtr) p);
+
+		var t = Stopwatch.StartNew ();
+		var args = stackalloc JValue [2];
+		args [0] = new JValue (intArray);
+		args [1] = new JValue (2);
+		for (int i = 0; i < C; ++i) {
+			int r = PinvokeEnv.StaticMethods.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
+		}
+		t.Stop ();
+		Console.WriteLine ("# {0} timing: {1}", nameof (JIPinvokeTiming), t.Elapsed);
+		Console.WriteLine ("#\tAverage Invocation: {0}ms", t.Elapsed.TotalMilliseconds / C);
+	}
+
+	static unsafe void XAIntPtrTiming (IntPtr _env)
 	{
-		var pe = new IntPtrEnv (_env);
-		var Arrays_class = IntPtrEnv.Types.FindClass ("java/util/Arrays");
-		var Arrays_binarySearch = IntPtrEnv.Members.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
-		var intArray = IntPtrEnv.Arrays.NewIntArray (3);
+		var pe = new XAIntPtrEnv (_env);
+		var Arrays_class = XAIntPtrEnv.Types.FindClass ("java/util/Arrays");
+		var Arrays_binarySearch = XAIntPtrEnv.StaticMethods.GetStaticMethodID (Arrays_class, "binarySearch", "([II)I");
+		var intArray = XAIntPtrEnv.Arrays.NewIntArray (3);
 		fixed (int* p = new int[]{1,2,3})
-			IntPtrEnv.Arrays.SetIntArrayRegion (intArray, 0, 3, (IntPtr) p);
+			XAIntPtrEnv.Arrays.SetIntArrayRegion (intArray, 0, 3, (IntPtr) p);
 
 		var t = Stopwatch.StartNew ();
 		var args = stackalloc JValue [2];
 		args [0] = new JValue (intArray);
 		args [1] = new JValue (2);
 		for (int i = 0; i < C; ++i) {
-			int r = IntPtrEnv.Members.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
+			int r = XAIntPtrEnv.StaticMethods.CallStaticIntMethod (Arrays_class, Arrays_binarySearch, args);
 		}
 		t.Stop ();
-		Console.WriteLine ("# JniObjectReference timing: {0}", t.Elapsed);
+		Console.WriteLine ("# {0} timing: {1}", nameof (XAIntPtrTiming), t.Elapsed);
 		Console.WriteLine ("#\tAverage Invocation: {0}ms", t.Elapsed.TotalMilliseconds / C);
 	}
 }
diff --git a/tools/jnienv-gen/Generator.cs b/tools/jnienv-gen/Generator.cs
index 95f771d85..06e62bc7c 100644
--- a/tools/jnienv-gen/Generator.cs
+++ b/tools/jnienv-gen/Generator.cs
@@ -15,13 +15,17 @@ public static string FixupType (this string t)
 
 	partial class Generator
 	{
+		static string jnienv_g_c;
 		static string jnienv_g_cs;
 
 		public static int Main (string [] args)
 		{
+			jnienv_g_c  = "JniEnvironment.g.c";
 			jnienv_g_cs = "JniEnvironment.g.cs";
 			if (args.Length > 0)
 				jnienv_g_cs = args [0];
+			if (args.Length > 1)
+				jnienv_g_c = args [1];
 			try {
 				using (TextWriter w = new StringWriter ()) {
 					w.NewLine = "\n";
@@ -32,6 +36,15 @@ public static int Main (string [] args)
 					else if (!File.Exists (jnienv_g_cs) || !string.Equals (content, File.ReadAllText (jnienv_g_cs)))
 						File.WriteAllText (jnienv_g_cs, content);
 				}
+				using (TextWriter w = new StringWriter ()) {
+					w.NewLine = "\n";
+					GenerateNativeLibSource (w);
+					string content = w.ToString ();
+					if (jnienv_g_c == "-" || jnienv_g_cs == "-")
+						Console.WriteLine (content);
+					else if (!File.Exists (jnienv_g_c) || !string.Equals (content, File.ReadAllText (jnienv_g_c)))
+						File.WriteAllText (jnienv_g_c, content);
+				}
 				return 0;
 			} catch (Exception ex) {
 				Console.WriteLine (ex);
@@ -42,6 +55,7 @@ public static int Main (string [] args)
 		static string Escape (string value)
 		{
 			switch (value) {
+			case "object":
 			case "string":
 			case "ref":
 				return "@" + value;
@@ -55,13 +69,19 @@ static void GenerateFile (TextWriter o)
 			o.WriteLine ("//");
 			o.WriteLine ("// To make changes, edit monodroid/tools/jnienv-gen-interop and rerun");
 			o.WriteLine ();
-			o.WriteLine ("#if !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS");
+			o.WriteLine ("#if !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS && !FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX && !FEATURE_HANDLES_ARE_XA_INTPTRS");
 			o.WriteLine ("#define FEATURE_HANDLES_ARE_SAFE_HANDLES");
-			o.WriteLine ("#endif  // !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS");
+			o.WriteLine ("#endif  // !FEATURE_HANDLES_ARE_SAFE_HANDLES && !FEATURE_HANDLES_ARE_INTPTRS && !FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX && !FEATURE_HANDLES_ARE_XA_INTPTRS");
 			o.WriteLine ();
 			o.WriteLine ("#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS");
 			o.WriteLine ("#define _NAMESPACE_PER_HANDLE");
 			o.WriteLine ("#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS");
+			o.WriteLine ("#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX");
+			o.WriteLine ("#define _NAMESPACE_PER_HANDLE");
+			o.WriteLine ("#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX");
+			o.WriteLine ("#if FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_XA_INTPTRS");
+			o.WriteLine ("#define _NAMESPACE_PER_HANDLE");
+			o.WriteLine ("#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES && FEATURE_HANDLES_ARE_XA_INTPTRS");
 			o.WriteLine ();
 			o.WriteLine ("using System;");
 			o.WriteLine ("using System.Linq;");
@@ -72,7 +92,7 @@ static void GenerateFile (TextWriter o)
 			o.WriteLine ();
 			o.WriteLine ("using JNIEnvPtr          = System.IntPtr;");
 			o.WriteLine ();
-			o.WriteLine ("#if FEATURE_HANDLES_ARE_INTPTRS");
+			o.WriteLine ("#if FEATURE_HANDLES_ARE_INTPTRS || FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX");
 			o.WriteLine ("\tusing jinstanceFieldID   = System.IntPtr;");
 			o.WriteLine ("\tusing jstaticFieldID     = System.IntPtr;");
 			o.WriteLine ("\tusing jinstanceMethodID  = System.IntPtr;");
@@ -83,39 +103,36 @@ static void GenerateFile (TextWriter o)
 			o.WriteLine ("namespace Java.Interop {");
 			GenerateJniNativeInterface (o);
 			o.WriteLine ("}");
-			o.WriteLine ("#if FEATURE_HANDLES_ARE_SAFE_HANDLES");
-			o.WriteLine ("namespace");
-			o.WriteLine ("#if _NAMESPACE_PER_HANDLE");
-			o.WriteLine ("\tJava.Interop.SafeHandles");
-			o.WriteLine ("#else");
-			o.WriteLine ("\tJava.Interop");
-			o.WriteLine ("#endif");
-			o.WriteLine ("{");
-			o.WriteLine ();
-			GenerateDelegates (o, HandleStyle.SafeHandle);
-			o.WriteLine ();
-			GenerateTypes (o, HandleStyle.SafeHandle);
-			o.WriteLine ();
-			GenerateJniNativeInterfaceInvoker (o, HandleStyle.SafeHandle);
-			o.WriteLine ("}");
-			o.WriteLine ("#endif  // FEATURE_HANDLES_ARE_SAFE_HANDLES");
-			o.WriteLine ("#if FEATURE_HANDLES_ARE_INTPTRS");
+			WriteSection (o, HandleStyle.SafeHandle,                "FEATURE_HANDLES_ARE_SAFE_HANDLES",                 "Java.Interop.SafeHandles");
+			WriteSection (o, HandleStyle.JIIntPtr,                  "FEATURE_HANDLES_ARE_INTPTRS",                      "Java.Interop.JIIntPtrs");
+			WriteSection (o, HandleStyle.JIIntPtrPinvokeWithErrors, "FEATURE_HANDLES_ARE_INTPTRS_WITH_PINVOKES_EX",     "Java.Interop.JIPinvokes");
+			WriteSection (o, HandleStyle.XAIntPtr,                  "FEATURE_HANDLES_ARE_XA_INTPTRS",                   "Java.Interop.XAIntPtrs");
+		}
+
+		static void WriteSection (TextWriter o, HandleStyle style, string define, string specificNamespace)
+		{
+			o.WriteLine ("#if {0}", define);
 			o.WriteLine ("namespace");
 			o.WriteLine ("#if _NAMESPACE_PER_HANDLE");
-			o.WriteLine ("\tJava.Interop.IntPtrs");
+			o.WriteLine ("\t{0}", specificNamespace);
 			o.WriteLine ("#else");
 			o.WriteLine ("\tJava.Interop");
 			o.WriteLine ("#endif");
 			o.WriteLine ("{");
 			o.WriteLine ();
-			GenerateDelegates (o, HandleStyle.IntPtr);
+			GenerateDelegates (o, style);
 			o.WriteLine ();
-			GenerateTypes (o, HandleStyle.IntPtr);
+			GenerateTypes (o, style);
 			o.WriteLine ();
-			GenerateJniNativeInterfaceInvoker (o, HandleStyle.IntPtr);
+			switch (style) {
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.SafeHandle:
+			case HandleStyle.XAIntPtr:
+				GenerateJniNativeInterfaceInvoker (o, style);
+				break;
+			}
 			o.WriteLine ("}");
-			o.WriteLine ("#endif // FEATURE_HANDLES_ARE_INTPTRS");
-			// GenerateJniNativeInterfaceInvoker2 (o);
+			o.WriteLine ("#endif  // {0}", define);
 		}
 		
 		static void GenerateDelegates (TextWriter o, HandleStyle style)
@@ -214,7 +231,7 @@ static void CreateDelegate (TextWriter o, JniFunction entry, HandleStyle style)
 					builder.Append (", ");
 					builder.AppendFormat ("{0} {1}",
 							entry.Parameters [i].Type.GetMarshalType (style, isReturn: false),
-							entry.Parameters [i].Name);
+							Escape (entry.Parameters [i].Name));
 				} 
 				
 				var ptype   = entry.Parameters [i].Type.GetManagedType (style, isReturn: false);
@@ -236,13 +253,7 @@ entry.Parameters [i].Type.GetMarshalType (style, isReturn: false),
 
 		static string GetJniEnvironmentPointerType (HandleStyle style)
 		{
-			switch (style) {
-			case HandleStyle.SafeHandle:
-				return "JNIEnvPtr";
-			case HandleStyle.IntPtr:
-				return "JNIEnvPtr";
-			}
-			return null;
+			return "JNIEnvPtr";
 		}
 
 		static void GenerateTypes (TextWriter o, HandleStyle style)
@@ -256,6 +267,10 @@ static void GenerateTypes (TextWriter o, HandleStyle style)
 				{ "Types",      "public" },
 			};
 			o.WriteLine ("\tpartial class JniEnvironment {");
+			if (style == HandleStyle.JIIntPtrPinvokeWithErrors) {
+				o.WriteLine ("\t\tconst string JavaInteropLib = \"JavaInterop\";");
+				o.WriteLine ();
+			}
 			foreach (var t in JNIEnvEntries
 					.Select (e => e.DeclaringType ?? "JniEnvironment")
 					.Distinct ()
@@ -281,6 +296,16 @@ static void GenerateJniEnv (TextWriter o, string type, string visibility, Handle
 					continue;
 
 				o.WriteLine ();
+				if (style == HandleStyle.JIIntPtrPinvokeWithErrors) {
+					o.WriteLine ("\t\t[DllImport (JavaInteropLib, CallingConvention=CallingConvention.Cdecl)]");
+					o.WriteLine ("\t\tstatic extern unsafe {0} JavaInterop_{1} (IntPtr jnienv{2}{3}{4});",
+							entry.ReturnType.GetMarshalType (style, isReturn: true),
+							entry.Name,
+							entry.Throws ? ", out IntPtr thrown" : "",
+							entry.Parameters.Length != 0 ? ", " : "",
+							string.Join (", ", entry.Parameters.Select (p => string.Format ("{0} {1}", p.Type.GetMarshalType (style, isReturn: false), Escape (p.Name)))));
+					o.WriteLine ();
+				}
 				o.Write ("\t\t{2} static unsafe {0} {1} (", entry.GetManagedReturnType (style), entry.ApiName, entry.Visibility);
 				switch (entry.ApiName) {
 				default:
@@ -293,10 +318,16 @@ static void GenerateJniEnv (TextWriter o, string type, string visibility, Handle
 					o.WriteLine (")");
 					o.WriteLine ("\t\t{");
 					NullCheckParameters (o, entry.Parameters, style);
+					if (style == HandleStyle.JIIntPtrPinvokeWithErrors && entry.Throws)
+						o.WriteLine ("\t\t\tIntPtr thrown;");
 					o.Write ("\t\t\t");
-					if (!is_void) 
+					if (!is_void)
 						o.Write ("var tmp = ");
-					o.Write ("JniEnvironment.Current.Invoker.{0} (JniEnvironment.Current.EnvironmentPointer", entry.Name);
+					if (style == HandleStyle.JIIntPtrPinvokeWithErrors) {
+						o.Write ("JavaInterop_{0} (JniEnvironment.Current.EnvironmentPointer{1}", entry.Name, entry.Throws ? ", out thrown" : "");
+					} else {
+						o.Write ("JniEnvironment.Current.Invoker.{0} (JniEnvironment.Current.EnvironmentPointer", entry.Name);
+					}
 					for (int i = 0; i < entry.Parameters.Length; i++) {
 						var p = entry.Parameters [i];
 						o.Write (", ");
@@ -305,7 +336,7 @@ static void GenerateJniEnv (TextWriter o, string type, string visibility, Handle
 						o.Write (p.Type.GetManagedToMarshalExpression (style, Escape (entry.Parameters [i].Name)));
 					}
 					o.WriteLine (");");
-					RaiseException (o, entry);
+					RaiseException (o, entry, style);
 					if (is_void) {
 					} else {
 						foreach (var line in entry.ReturnType.GetHandleCreationLogStatements (style, entry.Name, "tmp"))
@@ -338,18 +369,60 @@ static void NullCheckParameters (TextWriter o, ParamInfo[] ps, HandleStyle style
 				o.WriteLine ();
 		}
 
-		static void RaiseException (TextWriter o, JniFunction entry)
+		static void RaiseException (TextWriter o, JniFunction entry, HandleStyle style)
 		{
 			if (!entry.Throws)
 				return;
 
 			o.WriteLine ();
-			o.WriteLine ("\t\t\tException __e = JniEnvironment.Current.GetExceptionForLastThrowable ();");
+			o.WriteLine ("\t\t\tException __e = JniEnvironment.Current.GetExceptionForLastThrowable ({0});",
+					style == HandleStyle.JIIntPtrPinvokeWithErrors ? "thrown" : "");
 			o.WriteLine ("\t\t\tif (__e != null)");
 			o.WriteLine ("\t\t\t\tthrow __e;");
 			o.WriteLine ();
 		}
 
+		static void GenerateNativeLibSource (TextWriter o)
+		{
+			o.WriteLine ("/*");
+			o.WriteLine (" * Generated file; DO NOT EDIT!");
+			o.WriteLine (" *");
+			o.WriteLine (" * To make changes, edit Java.Interop/tools/jnienv-gen and rerun");
+			o.WriteLine (" */");
+			o.WriteLine ();
+			o.WriteLine ("#include <jni.h>");
+			o.WriteLine ();
+			o.WriteLine ("typedef jmethodID jstaticmethodID;");
+			o.WriteLine ("typedef jfieldID  jstaticfieldID;");
+			o.WriteLine ("typedef jobject   jglobal;");
+			foreach (JniFunction entry in JNIEnvEntries) {
+				if (entry.IsPrivate || entry.CustomWrapper)
+					continue;
+				o.WriteLine ();
+				o.WriteLine (entry.ReturnType.JniType);
+				o.WriteLine ("JavaInterop_{0} (JNIEnv *env{1}{2}{3})",
+					entry.Name,
+					entry.Throws ? ", jthrowable *_thrown" : "",
+					entry.Parameters.Length != 0 ? ", " : "",
+					string.Join (", ", entry.Parameters.Select (p => string.Format ("{0} {1}", p.Type.JniType, p.Name))));
+				o.WriteLine ("{");
+				bool isVoid = entry.ReturnType.JniType == "void";
+				if (entry.Throws)
+					o.WriteLine ("\t*_thrown = NULL;");
+				o.Write ("\t");
+				if (!isVoid)
+					o.Write ("{0} _r_ = ", entry.ReturnType.JniType);
+				o.WriteLine ("(*env)->{0} (env{1}{2});",
+					entry.Name,
+					entry.Parameters.Length != 0 ? ", " : "",
+					string.Join (", ", entry.Parameters.Select (p => p.Name)));
+				if (entry.Throws)
+					o.WriteLine ("\t*_thrown = (*env)->ExceptionOccurred (env);");
+				if (!isVoid)
+					o.WriteLine ("\treturn _r_;");
+				o.WriteLine ("}");
+			}
+		}
 	}
 
 	class JniFunction {
@@ -574,11 +647,13 @@ public override string[] GetMarshalToManagedStatements (HandleStyle style, strin
 		{
 			switch (style) {
 			case HandleStyle.SafeHandle:
+			case HandleStyle.XAIntPtr:
 				return new [] {
 					string.Format ("JniEnvironment.Current.LogCreateLocalRef ({0});", variable),
 					string.Format ("return {0};", variable),
 				};
-			case HandleStyle.IntPtr:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
 				return new [] {
 					string.Format ("JniEnvironment.Current.LogCreateLocalRef ({0});", variable),
 					string.Format ("return new JniObjectReference ({0}, JniObjectReferenceType.Local);", variable),
@@ -621,31 +696,66 @@ public override string GetMarshalType (HandleStyle style, bool isReturn)
 
 		public override string GetManagedType (HandleStyle style, bool isReturn)
 		{
-			return type;
+			switch (style) {
+			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+				return type;
+			case HandleStyle.XAIntPtr:
+				return "IntPtr";
+			}
+			return "TODO_" + style;;
 		}
 
 		public override string GetManagedToMarshalExpression (HandleStyle style, string variable)
 		{
-			return string.Format ("{0}.ID", variable);
+			switch (style) {
+			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+				return string.Format ("{0}.ID", variable);
+			}
+			return variable;
 		}
 
 		public override string[] VerifyParameter (HandleStyle style, string variable)
 		{
-			return new [] {
-				string.Format ("if ({0} == null)", variable),
-				string.Format ("\tthrow new ArgumentNullException (\"{0}\");", variable),
-				string.Format ("if ({0}.ID == IntPtr.Zero)", variable),
-				string.Format ("\tthrow new ArgumentException (\"Handle value cannot be null.\", \"{0}\");", variable),
-			};
+			switch (style) {
+			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+				return new [] {
+					string.Format ("if ({0} == null)", variable),
+					string.Format ("\tthrow new ArgumentNullException (\"{0}\");", variable),
+					string.Format ("if ({0}.ID == IntPtr.Zero)", variable),
+					string.Format ("\tthrow new ArgumentException (\"Handle value cannot be null.\", \"{0}\");", variable),
+				};
+			case HandleStyle.XAIntPtr:
+				return new[] {
+					string.Format ("if ({0} == IntPtr.Zero)", variable),
+					string.Format ("\tthrow new ArgumentException (\"Handle value cannot be null.\", \"{0}\");", variable),
+				};
+			}
+			return new string [0];
 		}
 
 		public override string[] GetMarshalToManagedStatements (HandleStyle style, string variable)
 		{
-			return new[] {
-				string.Format ("if ({0} == IntPtr.Zero)", variable),
-				string.Format ("\treturn null;"),
-				string.Format ("return new {0} ({1});", type, variable),
-			};
+			switch (style) {
+			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+				return new[] {
+					string.Format ("if ({0} == IntPtr.Zero)", variable),
+					string.Format ("\treturn null;"),
+					string.Format ("return new {0} ({1});", type, variable),
+				};
+			case HandleStyle.XAIntPtr:
+				return new[]{
+					string.Format ("return {0};", variable),
+				};
+			}
+			return new string [0];
 		}
 	}
 
@@ -697,7 +807,9 @@ public override string GetMarshalType (HandleStyle style, bool isReturn)
 			switch (style) {
 			case HandleStyle.SafeHandle:
 				return isReturn ? safeType : "JniReferenceSafeHandle";
-			case HandleStyle.IntPtr:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+			case HandleStyle.XAIntPtr:
 				return "jobject";
 			}
 			return null;
@@ -705,7 +817,15 @@ public override string GetMarshalType (HandleStyle style, bool isReturn)
 
 		public override string GetManagedType (HandleStyle style, bool isReturn)
 		{
-			return "JniObjectReference";
+			switch (style) {
+			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
+				return "JniObjectReference";
+			case HandleStyle.XAIntPtr:
+				return "IntPtr";
+			}
+			return "TODO";
 		}
 
 		public override string GetManagedToMarshalExpression (HandleStyle style, string variable)
@@ -713,8 +833,11 @@ public override string GetManagedToMarshalExpression (HandleStyle style, string
 			switch (style) {
 			case HandleStyle.SafeHandle:
 				return string.Format ("{0}.SafeHandle", variable);
-			case HandleStyle.IntPtr:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
 				return string.Format ("{0}.Handle", variable);
+			case HandleStyle.XAIntPtr:
+				return variable;
 			}
 			return null;
 		}
@@ -723,15 +846,17 @@ public override string[] GetMarshalToManagedStatements (HandleStyle style, strin
 		{
 			switch (style) {
 			case HandleStyle.SafeHandle:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
 				return new [] {
 					string.Format ("return new JniObjectReference ({0}, {1});", variable, refType),
 				};
-			case HandleStyle.IntPtr:
-				return new [] {
-					string.Format ("return new JniObjectReference ({0}, {1});", variable, refType),
+			case HandleStyle.XAIntPtr:
+				return new[] {
+					string.Format ("return {0};", variable),
 				};
 			}
-			return null;
+			return new string [0];
 		}
 
 		public override string[] VerifyParameter (HandleStyle style, string variable)
@@ -744,11 +869,17 @@ public override string[] VerifyParameter (HandleStyle style, string variable)
 					string.Format ("if ({0}.SafeHandle.IsInvalid)", variable),
 					string.Format ("\tthrow new ArgumentException (\"{0}\");", variable),
 				};
-			case HandleStyle.IntPtr:
+			case HandleStyle.JIIntPtr:
+			case HandleStyle.JIIntPtrPinvokeWithErrors:
 				return new [] {
 					string.Format ("if ({0}.Handle == IntPtr.Zero)", variable),
 					string.Format ("\tthrow new ArgumentException (\"`{0}` must not be IntPtr.Zero.\", \"{0}\");", variable),
 				};
+			case HandleStyle.XAIntPtr:
+				return new [] {
+					string.Format ("if ({0} == IntPtr.Zero)", variable),
+					string.Format ("\tthrow new ArgumentException (\"`{0}` must not be IntPtr.Zero.\", \"{0}\");", variable),
+				};
 			}
 			return new string [0];
 		}
@@ -837,7 +968,9 @@ enum Modifier {
 
 	enum HandleStyle {
 		SafeHandle,
-		IntPtr,
+		JIIntPtr,
+		JIIntPtrPinvokeWithErrors,
+		XAIntPtr,
 	}
 }
 
diff --git a/tools/jnienv-gen/Generator.g.cs b/tools/jnienv-gen/Generator.g.cs
index ecc59a6a3..cedba8110 100644
--- a/tools/jnienv-gen/Generator.g.cs
+++ b/tools/jnienv-gen/Generator.g.cs
@@ -35,7 +35,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jclass      (*DefineClass)(JNIEnv*, const char, jobject, const jbyte*, jsize);",
 				ReturnType    = "jclass",
-				Parameters    = new ParamInfo [] {new ParamInfo ("const char*", "name"), new ParamInfo ("jobject", "loader"), new ParamInfo ("const jbyte*", "buf"), new ParamInfo ("jsize", "bufLen")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("const char*", "name"), new ParamInfo ("jobject", "loader"), new ParamInfo ("const jbyte*", "buffer"), new ParamInfo ("jsize", "bufferLength")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -68,7 +68,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*ToReflectedMethod)(JNIEnv*, jclass, jmethodID, jboolean);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "cls"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jboolean", "isStatic")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jboolean", "isStatic")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -76,7 +76,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jclass      (*GetSuperclass)(JNIEnv*, jclass);",
 				ReturnType    = "jclass",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -84,7 +84,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jboolean    (*IsAssignableFrom)(JNIEnv*, jclass, jclass);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "clazz1"), new ParamInfo ("jclass", "clazz2")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "class1"), new ParamInfo ("jclass", "class2")},
 			},
 			new JniFunction {
 				DeclaringType = ReflectionSupportCategory,
@@ -92,7 +92,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*ToReflectedField)(JNIEnv*, jclass, jfieldID, jboolean);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "cls"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jboolean", "isStatic")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jboolean", "isStatic")},
 			},
 			new JniFunction {
 				DeclaringType = ExceptionsCategory,
@@ -102,7 +102,7 @@ partial class Generator
 				// Throws        = true,
 				Prototype     = "jint        (*Throw)(JNIEnv*, jthrowable);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jthrowable", "obj")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jthrowable", "toThrow")},
 			},
 			new JniFunction {
 				DeclaringType = ExceptionsCategory,
@@ -112,7 +112,7 @@ partial class Generator
 				// Throws        = true,
 				Prototype     = "jint        (*ThrowNew)(JNIEnv*, jclass, const char*);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "clazz"), new ParamInfo ("const char*", "message")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const char*", "message")},
 			},
 			new JniFunction {
 				DeclaringType = ExceptionsCategory,
@@ -144,7 +144,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*FatalError)(JNIEnv*, const char*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("const char*", "msg")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("const char*", "message")},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -171,7 +171,7 @@ partial class Generator
 				// Prebind       = true,
 				Prototype     = "jobject     (*NewGlobalRef)(JNIEnv*, jobject);",
 				ReturnType    = "jglobal",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -180,7 +180,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*DeleteGlobalRef)(JNIEnv*, jobject);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("IntPtr", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo (TypeInfo.Create ("jobject", "IntPtr"), "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -190,7 +190,7 @@ partial class Generator
 				// Prebind       = true,
 				Prototype     = "void        (*DeleteLocalRef)(JNIEnv*, jobject);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("IntPtr", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo (TypeInfo.Create ("jobject", "IntPtr"), "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -198,7 +198,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jboolean    (*IsSameObject)(JNIEnv*, jobject, jobject);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "ref1", Modifier.CanBeNull), new ParamInfo ("jobject", "ref2", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object1", Modifier.CanBeNull), new ParamInfo ("jobject", "object2", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -207,7 +207,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*NewLocalRef)(JNIEnv*, jobject);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -225,7 +225,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*AllocObject)(JNIEnv*, jclass);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass")},
 			},
 			new JniFunction {
 				DeclaringType = ObjectOperationsCategory,
@@ -234,7 +234,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*NewObject)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = ObjectOperationsCategory,
@@ -243,7 +243,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*NewObjectV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = ObjectOperationsCategory,
@@ -253,7 +253,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*NewObjectA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -261,7 +261,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jclass      (*GetObjectClass)(JNIEnv*, jobject);",
 				ReturnType    = "jclass",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -269,7 +269,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jboolean    (*IsInstanceOf)(JNIEnv*, jobject, jclass);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "clazz")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -278,7 +278,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jmethodID   (*GetMethodID)(JNIEnv*, jclass, const char*, const char*);",
 				ReturnType    = "jmethodID",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "kls"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "signature")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "signature")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -287,7 +287,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -296,7 +296,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallObjectMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -306,7 +306,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*CallObjectMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -315,7 +315,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -324,7 +324,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -334,7 +334,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -343,7 +343,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -352,7 +352,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -362,7 +362,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -371,7 +371,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -380,7 +380,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -390,7 +390,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -399,7 +399,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallShortMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -408,7 +408,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallShortMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -418,7 +418,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallShortMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -427,7 +427,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -436,7 +436,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallIntMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -446,7 +446,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallIntMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -455,7 +455,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallLongMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -464,7 +464,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallLongMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -474,7 +474,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallLongMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -483,7 +483,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallFloatMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -492,7 +492,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallFloatMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -502,7 +502,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallFloatMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -511,7 +511,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallDoubleMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -520,7 +520,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallDoubleMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -530,7 +530,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallDoubleMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -539,7 +539,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -548,7 +548,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallVoidMethodV)(JNIEnv*, jobject, jmethodID, va_list);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -558,7 +558,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallVoidMethodA)(JNIEnv*, jobject, jmethodID, jvalue*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -567,7 +567,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -576,7 +576,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallNonvirtualObjectMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    ="jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -586,7 +586,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallNonvirtualObjectMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -595,7 +595,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -604,7 +604,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallNonvirtualBooleanMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -614,7 +614,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallNonvirtualBooleanMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -623,7 +623,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -632,7 +632,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -642,7 +642,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallNonvirtualByteMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -651,7 +651,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -660,7 +660,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -670,7 +670,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -679,7 +679,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallNonvirtualShortMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -688,7 +688,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallNonvirtualShortMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -698,7 +698,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallNonvirtualShortMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -707,7 +707,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -716,7 +716,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallNonvirtualIntMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -726,7 +726,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallNonvirtualIntMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -735,7 +735,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallNonvirtualLongMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -744,7 +744,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallNonvirtualLongMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -754,7 +754,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jlong       (*CallNonvirtualLongMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -763,7 +763,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallNonvirtualFloatMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -772,7 +772,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallNonvirtualFloatMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -782,7 +782,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallNonvirtualFloatMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -791,7 +791,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallNonvirtualDoubleMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -800,7 +800,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallNonvirtualDoubleMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -810,7 +810,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallNonvirtualDoubleMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -819,7 +819,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, jmethodID, ...);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -828,7 +828,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallNonvirtualVoidMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceMethodsCategory,
@@ -838,7 +838,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallNonvirtualVoidMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jclass", "jclass"), new ParamInfo ("jmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jclass", "klass"), new ParamInfo ("jmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -847,7 +847,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfieldID    (*GetFieldID)(JNIEnv*, jclass, const char*, const char*);",
 				ReturnType    = "jfieldID",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "sig")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "signature")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -855,7 +855,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*GetObjectField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -863,7 +863,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jboolean    (*GetBooleanField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -871,7 +871,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jbyte       (*GetByteField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -879,7 +879,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jchar       (*GetCharField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -887,7 +887,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jshort      (*GetShortField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -895,7 +895,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jint        (*GetIntField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -903,7 +903,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jlong       (*GetLongField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -911,7 +911,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jfloat      (*GetFloatField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -919,7 +919,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jdouble     (*GetDoubleField)(JNIEnv*, jobject, jfieldID);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -928,7 +928,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetObjectField)(JNIEnv*, jobject, jfieldID, jobject);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jobject", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jobject", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -937,7 +937,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetBooleanField)(JNIEnv*, jobject, jfieldID, jboolean);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jboolean", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jboolean", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -946,7 +946,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetByteField)(JNIEnv*, jobject, jfieldID, jbyte);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jbyte", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jbyte", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -955,7 +955,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetCharField)(JNIEnv*, jobject, jfieldID, jchar);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jchar", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jchar", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -964,7 +964,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetShortField)(JNIEnv*, jobject, jfieldID, jshort);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jshort", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jshort", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -973,7 +973,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetIntField)(JNIEnv*, jobject, jfieldID, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jint", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jint", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -982,7 +982,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetLongField)(JNIEnv*, jobject, jfieldID, jlong);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jlong", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jlong", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -991,7 +991,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetFloatField)(JNIEnv*, jobject, jfieldID, jfloat);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jfloat", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jfloat", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = InstanceFieldsCategory,
@@ -1000,7 +1000,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetDoubleField)(JNIEnv*, jobject, jfieldID, jdouble);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject"), new ParamInfo ("jfieldID", "jfieldID"), new ParamInfo ("jdouble", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object"), new ParamInfo ("jfieldID", "field"), new ParamInfo ("jdouble", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1009,7 +1009,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jmethodID   (*GetStaticMethodID)(JNIEnv*, jclass, const char*, const char*);",
 				ReturnType    = "jstaticmethodID",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "sig")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "signature")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1018,7 +1018,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1027,7 +1027,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallStaticObjectMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1037,7 +1037,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jobject     (*CallStaticObjectMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1046,7 +1046,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1055,7 +1055,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1065,7 +1065,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jboolean    (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1074,7 +1074,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1083,7 +1083,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jbyte       (*CallStaticByteMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1093,7 +1093,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jbyte       (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1102,7 +1102,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1111,7 +1111,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1121,7 +1121,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jchar       (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1130,7 +1130,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallStaticShortMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1139,7 +1139,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallStaticShortMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1149,7 +1149,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jshort      (*CallStaticShortMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1158,7 +1158,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1167,7 +1167,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallStaticIntMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1177,7 +1177,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*CallStaticIntMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1186,7 +1186,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallStaticLongMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1195,7 +1195,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallStaticLongMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1205,7 +1205,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jlong       (*CallStaticLongMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1214,7 +1214,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallStaticFloatMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1223,7 +1223,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallStaticFloatMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1233,7 +1233,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jfloat      (*CallStaticFloatMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1242,7 +1242,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallStaticDoubleMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1251,7 +1251,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallStaticDoubleMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1261,7 +1261,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jdouble     (*CallStaticDoubleMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1270,7 +1270,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1279,7 +1279,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallStaticVoidMethodV)(JNIEnv*, jclass, jmethodID, va_list);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("va_list", "args")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("va_list", "args")},
 			},
 			new JniFunction {
 				DeclaringType = StaticMethodsCategory,
@@ -1289,7 +1289,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*CallStaticVoidMethodA)(JNIEnv*, jclass, jmethodID, jvalue*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticmethodID", "jmethod"), new ParamInfo ("jvalue*", "parms", true)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticmethodID", "method"), new ParamInfo ("jvalue*", "args", true)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1298,7 +1298,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jstaticfieldID    (*GetStaticFieldID)(JNIEnv*, jclass, const char*, const char*);",
 				ReturnType    = "jstaticfieldID",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "sig")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const char*", "name"), new ParamInfo ("const char*", "signature")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1306,7 +1306,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobject     (*GetStaticObjectField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jobject",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1314,7 +1314,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jboolean    (*GetStaticBooleanField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jboolean",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1322,7 +1322,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jbyte       (*GetStaticByteField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jbyte",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1330,7 +1330,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jchar       (*GetStaticCharField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jchar",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1338,7 +1338,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jshort      (*GetStaticShortField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jshort",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1346,7 +1346,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jint        (*GetStaticIntField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1354,7 +1354,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jlong       (*GetStaticLongField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1362,7 +1362,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jfloat      (*GetStaticFloatField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jfloat",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1370,7 +1370,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jdouble     (*GetStaticDoubleField)(JNIEnv*, jclass, jfieldID);",
 				ReturnType    = "jdouble",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field")},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1379,7 +1379,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticObjectField)(JNIEnv*, jclass, jfieldID, jobject);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jobject", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jobject", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1388,7 +1388,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticBooleanField)(JNIEnv*, jclass, jfieldID, jboolean);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jboolean", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jboolean", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1397,7 +1397,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticByteField)(JNIEnv*, jclass, jfieldID, jbyte);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jbyte", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jbyte", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1406,7 +1406,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticCharField)(JNIEnv*, jclass, jfieldID, jchar);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jchar", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jchar", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1415,7 +1415,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticShortField)(JNIEnv*, jclass, jfieldID, jshort);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jshort", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jshort", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1424,7 +1424,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticIntField)(JNIEnv*, jclass, jfieldID, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jint", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jint", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1433,7 +1433,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticLongField)(JNIEnv*, jclass, jfieldID, jlong);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jlong", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jlong", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1442,7 +1442,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticFloatField)(JNIEnv*, jclass, jfieldID, jfloat);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jfloat", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jfloat", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StaticFieldsCategory,
@@ -1451,7 +1451,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*SetStaticDoubleField)(JNIEnv*, jclass, jfieldID, jdouble);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("jstaticfieldID", "jfieldID"), new ParamInfo ("jdouble", "val", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("jstaticfieldID", "field"), new ParamInfo ("jdouble", "value", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1461,7 +1461,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jstring     (*NewString)(JNIEnv*, const jchar*, jsize);",
 				ReturnType    = "jstring",
-				Parameters    = new ParamInfo [] {new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "unicodeChars"), new ParamInfo ("jsize", "len")},
+				Parameters    = new ParamInfo [] {new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "unicodeChars"), new ParamInfo ("jsize", "length")},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1469,7 +1469,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jsize       (*GetStringLength)(JNIEnv*, jstring);",
 				ReturnType    = "jsize",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string")},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1477,7 +1477,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "const jchar* (*GetStringChars)(JNIEnv*, jstring, jboolean*);",
 				ReturnType    = TypeInfo.Create ("const jchar*", "IntPtr"),
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1485,7 +1485,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*ReleaseStringChars)(JNIEnv*, jstring, const jchar*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "chars")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "chars")},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1502,7 +1502,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "jsize       (*GetStringUTFLength)(JNIEnv*, jstring);",
 				ReturnType    = "jsize",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string")},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1510,7 +1510,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "const char* (*GetStringUTFChars)(JNIEnv*, jstring, jboolean*);",
 				ReturnType    = "const char*",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1518,7 +1518,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "void        (*ReleaseStringUTFChars)(JNIEnv*, jstring, const char*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo ("const char*", "utf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("const char*", "utf")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1692,7 +1692,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jboolean*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jboolean*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1700,7 +1700,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseByteArrayElements)(JNIEnv*, jbyteArray, jbyte*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jbyte*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jbyte*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1708,7 +1708,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseCharArrayElements)(JNIEnv*, jcharArray, jchar*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jchar*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jchar*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1716,7 +1716,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseShortArrayElements)(JNIEnv*, jshortArray, jshort*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jshort*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jshort*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1724,7 +1724,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseIntArrayElements)(JNIEnv*, jintArray, jint*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jint*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jint*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1732,7 +1732,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseLongArrayElements)(JNIEnv*, jlongArray, jlong*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jlong*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jlong*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1740,7 +1740,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseFloatArrayElements)(JNIEnv*, jfloatArray, jfloat*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jfloatArray", "array"), new ParamInfo ("jfloat*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jfloatArray", "array"), new ParamInfo ("jfloat*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1748,7 +1748,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void        (*ReleaseDoubleArrayElements)(JNIEnv*, jdoubleArray, jdouble*, jint);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jdouble*", "elems"), new ParamInfo ("jint", "mode")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jdouble*", "elements"), new ParamInfo ("jint", "mode")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1757,7 +1757,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetBooleanArrayRegion)(JNIEnv*, jbooleanArray, jsize, jsize, jboolean*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jboolean*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jboolean*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1766,7 +1766,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, jbyte*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jbyte*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jbyte*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1775,7 +1775,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, jchar*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jchar*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jchar*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1784,7 +1784,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, jshort*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jshort*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jshort*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1793,7 +1793,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, jint*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jint*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jint*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1802,7 +1802,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, jlong*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jlong*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jlong*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1811,7 +1811,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, jfloat*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jlong*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jfloat*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1820,7 +1820,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*GetDoubleArrayRegion)(JNIEnv*, jdoubleArray, jsize, jsize, jdouble*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jdouble*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jdouble*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1829,7 +1829,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetBooleanArrayRegion)(JNIEnv*, jbooleanArray, jsize, jsize, const jboolean*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jboolean*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbooleanArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jboolean*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1838,7 +1838,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, const jbyte*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jbyte*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jbyteArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jbyte*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1847,7 +1847,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, const jchar*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jcharArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo (TypeInfo.Create ("const jchar*", "IntPtr"), "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1856,7 +1856,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, const jshort*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jshort*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jshortArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jshort*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1865,7 +1865,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, const jint*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jint*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jintArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jint*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1874,7 +1874,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, const jlong*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jlong*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jlongArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jlong*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1883,7 +1883,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, const jfloat*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jfloatArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jfloat*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jfloatArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jfloat*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1892,7 +1892,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "void        (*SetDoubleArrayRegion)(JNIEnv*, jdoubleArray, jsize, jsize, const jdouble*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("const jdouble*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jdoubleArray", "array"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("const jdouble*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -1902,7 +1902,7 @@ partial class Generator
 				Throws        = true,
 				Prototype     = "jint        (*RegisterNatives)(JNIEnv*, jclass, const JNINativeMethod*, jint);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass"), new ParamInfo ("const JNINativeMethod*", "methods"), new ParamInfo ("jint", "nMethods")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass"), new ParamInfo ("const JNINativeMethod*", "methods"), new ParamInfo ("jint", "numMethods")},
 			},
 			new JniFunction {
 				DeclaringType = ClassesCategory,
@@ -1910,7 +1910,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jint        (*UnregisterNatives)(JNIEnv*, jclass);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "jclass")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jclass", "klass")},
 			},
 			new JniFunction {
 				DeclaringType = MonitorOperationsCategory,
@@ -1918,7 +1918,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jint        (*MonitorEnter)(JNIEnv*, jobject);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object")},
 			},
 			new JniFunction {
 				DeclaringType = MonitorOperationsCategory,
@@ -1926,7 +1926,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jint        (*MonitorExit)(JNIEnv*, jobject);",
 				ReturnType    = "jint",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "obj")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object")},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -1943,7 +1943,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "void        (*GetStringRegion)(JNIEnv*, jstring, jsize, jsize, jchar*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "str"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("jchar*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("jchar*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1951,7 +1951,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "void        (*GetStringUTFRegion)(JNIEnv*, jstring, jsize, jsize, char*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "str"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "len"), new ParamInfo ("char*", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("jsize", "start"), new ParamInfo ("jsize", "length"), new ParamInfo ("char*", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ArrayOperationsCategory,
@@ -1975,7 +1975,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "const jchar* (*GetStringCritical)(JNIEnv*, jstring, jboolean*);",
 				ReturnType    = "const jchar*",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("jboolean*", "isCopy", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = StringOperationsCategory,
@@ -1983,7 +1983,7 @@ partial class Generator
 				Visibility    = "private",
 				Prototype     = "void        (*ReleaseStringCritical)(JNIEnv*, jstring, const jchar*);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "@string"), new ParamInfo ("const jchar*", "carray")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jstring", "string"), new ParamInfo ("const jchar*", "carray")},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -1991,7 +1991,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jweak       (*NewWeakGlobalRef)(JNIEnv*, jobject);",
 				ReturnType    = "jweak",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -2000,7 +2000,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "void        (*DeleteWeakGlobalRef)(JNIEnv*, jweak);",
 				ReturnType    = "void",
-				Parameters    = new ParamInfo [] {new ParamInfo ("IntPtr", "jobject", Modifier.CanBeNull)},
+				Parameters    = new ParamInfo [] {new ParamInfo (TypeInfo.Create ("jobject", "IntPtr"), "object", Modifier.CanBeNull)},
 			},
 			new JniFunction {
 				DeclaringType = ExceptionsCategory,
@@ -2025,7 +2025,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "void*       (*GetDirectBufferAddress)(JNIEnv*, jobject);",
 				ReturnType    = "void*",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = NIOSupportCategory,
@@ -2033,7 +2033,7 @@ partial class Generator
 				Visibility    = "public",
 				Prototype     = "jlong       (*GetDirectBufferCapacity)(JNIEnv*, jobject);",
 				ReturnType    = "jlong",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "buf")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "buffer")},
 			},
 			new JniFunction {
 				DeclaringType = ReferencesCatgeory,
@@ -2041,7 +2041,7 @@ partial class Generator
 				Visibility    = "internal",
 				Prototype     = "jobjectRefType (*GetObjectRefType)(JNIEnv*, jobject);",
 				ReturnType    = "jobjectRefType",
-				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "jobject")},
+				Parameters    = new ParamInfo [] {new ParamInfo ("jobject", "object")},
 			},
 		};
 	}