diff --git a/.gitmodules b/.gitmodules
index 3a19311..3c18f58 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,12 @@
 [submodule "Injection4Android"]
 	path = Injection4Android
 	url = https://github.com/SwiftJava/Injection4Android.git
+[submodule "swift-android-Clibadder"]
+	path = swift-android-Clibadder
+	url = https://github.com/SwiftJava/swift-android-Clibadder
+[submodule "swift-android-opengl"]
+	path = swift-android-opengl
+	url = https://github.com/SwiftJava/swift-android-opengl
+[submodule "swift-android-zlib"]
+	path = swift-android-zlib
+	url = https://github.com/SwiftJava/swift-android-zlib
diff --git a/CJavaVM b/CJavaVM
index 6240b2a..654df50 160000
--- a/CJavaVM
+++ b/CJavaVM
@@ -1 +1 @@
-Subproject commit 6240b2a563f02d98a162d4dce856b6c9a7196c90
+Subproject commit 654df50b44ba88e7382f6f5cc8eb2aa5179f544d
diff --git a/JDBC/AppDelegate.swift b/JDBC/AppDelegate.swift
index 2d8f639..17d44f3 100644
--- a/JDBC/AppDelegate.swift
+++ b/JDBC/AppDelegate.swift
@@ -62,7 +62,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
         }
 
         // Use Thread class to run in background to get the correct class loader & classpath
-        Thread( {
+        JavaThread( {
 
             do {
                 if try JavaClass.forName( self.driverClass.stringValue ) == nil {
@@ -114,7 +114,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTableViewDataSource, NSTab
 
                     for i in 0..<model.columnNames.count {
                         let columnName = model.columnNames[i]
-                        let column = NSTableColumn(identifier: columnName)
+                        let column = NSTableColumn(identifier: NSUserInterfaceItemIdentifier(rawValue: columnName))
                         column.title = columnName
                         model.indexByColumn[column] = i
                         self.tableView.addTableColumn(column)
diff --git a/SwiftJava.xcodeproj/project.pbxproj b/SwiftJava.xcodeproj/project.pbxproj
index dbc7d53..d9e47e6 100644
--- a/SwiftJava.xcodeproj/project.pbxproj
+++ b/SwiftJava.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		BB31E20F1D4FF13400779860 /* genpkg.sh in Resources */ = {isa = PBXBuildFile; fileRef = BB31E20E1D4FF13400779860 /* genpkg.sh */; };
+		BB408A1420BF101A00B57CFB /* swift-android-zlib in Resources */ = {isa = PBXBuildFile; fileRef = BB408A1220BF101900B57CFB /* swift-android-zlib */; };
+		BB408A1620BF102A00B57CFB /* swift-android-opengl in Resources */ = {isa = PBXBuildFile; fileRef = BB408A1520BF102900B57CFB /* swift-android-opengl */; };
 		BB4AF49E1D4C1F80001DCA63 /* java_sql.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBBF2E8E1D49A0C3004142AE /* java_sql.framework */; };
 		BB5ACFDF1D35B09900E2386A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB5ACFDE1D35B09900E2386A /* AppDelegate.swift */; };
 		BB5ACFE11D35B09900E2386A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BB5ACFE01D35B09900E2386A /* Assets.xcassets */; };
@@ -36,6 +38,7 @@
 		BBC13DB91D48FDCE0035A039 /* org_swiftjava.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC13DB81D48FDCE0035A039 /* org_swiftjava.swift */; };
 		BBC13DC21D4900AA0035A039 /* SwiftTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC13DC11D4900AA0035A039 /* SwiftTest.swift */; };
 		BBCCEF9A1F3C83440084F9E3 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BBCCEF991F3C83440084F9E3 /* LICENSE */; };
+		BBE0F86F20B733FE00332AC6 /* swift-android-Clibadder in Resources */ = {isa = PBXBuildFile; fileRef = BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */; };
 		BBF280D91D64BC6100A7AF5D /* src in Resources */ = {isa = PBXBuildFile; fileRef = BBF280D81D64BC6100A7AF5D /* src */; };
 		CE3185101F368D6B002046A6 /* SwiftHelloTypes_TextListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */; };
 		CE4A250B1F34B3E0003AF384 /* JavaVM.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBCD66ED1D36A03F00DF5E47 /* JavaVM.framework */; };
@@ -222,6 +225,8 @@
 		BB0AB6B71F755A5A00B60EC0 /* swift-android-injection */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-injection"; sourceTree = "<group>"; };
 		BB19B4411D673986002F5586 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		BB31E20E1D4FF13400779860 /* genpkg.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genpkg.sh; sourceTree = "<group>"; };
+		BB408A1220BF101900B57CFB /* swift-android-zlib */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-zlib"; sourceTree = "<group>"; };
+		BB408A1520BF102900B57CFB /* swift-android-opengl */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-opengl"; sourceTree = "<group>"; };
 		BB5ACFDB1D35B09900E2386A /* JDBC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JDBC.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BB5ACFDE1D35B09900E2386A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		BB5ACFE01D35B09900E2386A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -231,6 +236,7 @@
 		BB643B311F4873F7003E849E /* swift-android-gradle */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-gradle"; sourceTree = "<group>"; };
 		BB6651301F2E39F6004EFD5F /* swift-android-kotlin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-kotlin"; sourceTree = "<group>"; };
 		BB6651351F2E3F50004EFD5F /* android_toolchain */ = {isa = PBXFileReference; lastKnownFileType = folder; path = android_toolchain; sourceTree = "<group>"; };
+		BB88CEC721CC388400B79BD9 /* swifthello.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = swifthello.swift; path = "swift-android-samples/swifthello/src/main/swift/Sources/swifthello.swift"; sourceTree = "<group>"; };
 		BB8AC4391D3F035700BD5B0F /* libswiftCore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libswiftCore.tbd; path = System/Library/PrivateFrameworks/Swift/libswiftCore.tbd; sourceTree = SDKROOT; };
 		BB8AC4621D3F11E600BD5B0F /* examples */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = examples; sourceTree = BUILT_PRODUCTS_DIR; };
 		BB8AC46E1D3F217D00BD5B0F /* libjvm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjvm.dylib; path = ../../../../Library/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server/libjvm.dylib; sourceTree = "<group>"; };
@@ -271,6 +277,7 @@
 		BBCD6EBC1D383E3700DF5E47 /* genswift.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = genswift.java; path = src/genswift.java; sourceTree = "<group>"; };
 		BBCD75371D38DC4200DF5E47 /* overrides.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = overrides.pl; sourceTree = "<group>"; };
 		BBCD9F871D3CD05900DF5E47 /* genswift.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = genswift.sh; sourceTree = "<group>"; };
+		BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "swift-android-Clibadder"; sourceTree = "<group>"; };
 		BBF280D81D64BC6100A7AF5D /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
 		CE31850E1F368D44002046A6 /* SwiftHelloTypes_TextListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SwiftHelloTypes_TextListener.swift; path = com_johnholdsworth/Sources/SwiftHelloTypes_TextListener.swift; sourceTree = SOURCE_ROOT; };
 		CE4A250F1F3555CA003AF384 /* com_johnholdsworth */ = {isa = PBXFileReference; lastKnownFileType = folder; path = com_johnholdsworth; sourceTree = "<group>"; };
@@ -284,7 +291,6 @@
 		CE649E301F39E88200C5B7FE /* SwiftHelloTest.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHelloTest.java; path = src/com/johnholdsworth/swiftbindings/SwiftHelloTest.java; sourceTree = "<group>"; };
 		CE75236D1F33E9A3003795CA /* libjvm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjvm.dylib; path = ../../../Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/server/libjvm.dylib; sourceTree = "<group>"; };
 		CE8102391F3693510069563B /* MainActivity.kt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = MainActivity.kt; path = "swift-android-kotlin/app/src/main/java/com/example/user/myapplication/MainActivity.kt"; sourceTree = "<group>"; };
-		CE81023B1F3693790069563B /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = "swift-android-kotlin/app/src/main/swift/Sources/main.swift"; sourceTree = "<group>"; };
 		CE81023D1F369D8D0069563B /* SwiftHello.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; name = SwiftHello.java; path = "swift-android-samples/swifthello/src/main/java/net/zhuoweizhang/swifthello/SwiftHello.java"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -345,6 +351,9 @@
 				BB9CF8971D61BAF4004781B9 /* swift-android-samples */,
 				BB6651301F2E39F6004EFD5F /* swift-android-kotlin */,
 				BB0AB6B71F755A5A00B60EC0 /* swift-android-injection */,
+				BBE0F86E20B733FC00332AC6 /* swift-android-Clibadder */,
+				BB408A1520BF102900B57CFB /* swift-android-opengl */,
+				BB408A1220BF101900B57CFB /* swift-android-zlib */,
 				BB0AB6B31F7559C700B60EC0 /* Injection4Android */,
 				BB5ACFDC1D35B09900E2386A /* Products */,
 				BBCD66EC1D36A03F00DF5E47 /* Frameworks */,
@@ -526,7 +535,7 @@
 			children = (
 				CE81023D1F369D8D0069563B /* SwiftHello.java */,
 				CE8102391F3693510069563B /* MainActivity.kt */,
-				CE81023B1F3693790069563B /* main.swift */,
+				BB88CEC721CC388400B79BD9 /* swifthello.swift */,
 			);
 			name = Android;
 			sourceTree = "<group>";
@@ -605,7 +614,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "John Holdsworth";
 				TargetAttributes = {
 					BB5ACFDA1D35B09900E2386A = {
@@ -636,6 +645,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -750,12 +760,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE4A25101F3555CA003AF384 /* com_johnholdsworth in Resources */,
+				BB408A1620BF102A00B57CFB /* swift-android-opengl in Resources */,
 				BBCCEF9A1F3C83440084F9E3 /* LICENSE in Resources */,
 				BB5ACFE11D35B09900E2386A /* Assets.xcassets in Resources */,
+				BBE0F86F20B733FE00332AC6 /* swift-android-Clibadder in Resources */,
 				BBAD3EE41D5A84700091D139 /* genall.sh in Resources */,
 				BB6651321F2E39F7004EFD5F /* swift-android-kotlin in Resources */,
 				BB6651361F2E3F51004EFD5F /* android_toolchain in Resources */,
 				BB31E20F1D4FF13400779860 /* genpkg.sh in Resources */,
+				BB408A1420BF101A00B57CFB /* swift-android-zlib in Resources */,
 				BBF280D91D64BC6100A7AF5D /* src in Resources */,
 				BB643B321F4873F7003E849E /* swift-android-gradle in Resources */,
 				BB9CF8981D61BAF4004781B9 /* swift-android-samples in Resources */,
@@ -908,6 +921,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -915,6 +929,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -963,6 +978,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -970,6 +986,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1009,7 +1026,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.swiftjava.JDBC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1024,7 +1041,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.swiftjava.JDBC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1034,7 +1051,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1044,7 +1061,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/android_toolchain b/android_toolchain
index f9e6cad..76847bc 160000
--- a/android_toolchain
+++ b/android_toolchain
@@ -1 +1 @@
-Subproject commit f9e6cadd8e0a112761b193339ccdec1f8833e7b9
+Subproject commit 76847bcd23f309109d408935fdc47d4815a478dc
diff --git a/com_apple b/com_apple
index 91d2699..5714c6a 160000
--- a/com_apple
+++ b/com_apple
@@ -1 +1 @@
-Subproject commit 91d2699cda183bab7bd70207d70d95b4e5337030
+Subproject commit 5714c6ac1b99f449f9be416ac4abf5aec15de62e
diff --git a/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift b/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift
index 6d3bf68..09718d0 100644
--- a/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift
+++ b/com_johnholdsworth/Sources/SwiftHelloTypes_Planet.swift
@@ -91,7 +91,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var EARTH_FieldID: jfieldID?
 
-    open static var EARTH: SwiftHelloTypes_Planet! {
+    public static var EARTH: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "EARTH", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &EARTH_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -103,7 +103,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var G_FieldID: jfieldID?
 
-    open static var G: Double {
+    public static var G: Double {
         get {
             let __value = JNIField.GetStaticDoubleField( fieldName: "G", fieldType: "D", fieldCache: &G_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             return __value
@@ -114,7 +114,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var JUPITER_FieldID: jfieldID?
 
-    open static var JUPITER: SwiftHelloTypes_Planet! {
+    public static var JUPITER: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "JUPITER", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &JUPITER_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -126,7 +126,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var MARS_FieldID: jfieldID?
 
-    open static var MARS: SwiftHelloTypes_Planet! {
+    public static var MARS: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "MARS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &MARS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -138,7 +138,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var MERCURY_FieldID: jfieldID?
 
-    open static var MERCURY: SwiftHelloTypes_Planet! {
+    public static var MERCURY: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "MERCURY", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &MERCURY_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -150,7 +150,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var NEPTUNE_FieldID: jfieldID?
 
-    open static var NEPTUNE: SwiftHelloTypes_Planet! {
+    public static var NEPTUNE: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "NEPTUNE", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &NEPTUNE_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -162,7 +162,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var SATURN_FieldID: jfieldID?
 
-    open static var SATURN: SwiftHelloTypes_Planet! {
+    public static var SATURN: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "SATURN", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &SATURN_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -174,7 +174,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var URANUS_FieldID: jfieldID?
 
-    open static var URANUS: SwiftHelloTypes_Planet! {
+    public static var URANUS: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "URANUS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &URANUS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -186,7 +186,7 @@ open class SwiftHelloTypes_PlanetForward: JNIObjectForward {
 
     private static var VENUS_FieldID: jfieldID?
 
-    open static var VENUS: SwiftHelloTypes_Planet! {
+    public static var VENUS: SwiftHelloTypes_Planet! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "VENUS", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet;", fieldCache: &VENUS_FieldID, className: "com/johnholdsworth/swiftbindings/SwiftHelloTypes$Planet", classCache: &SwiftHelloTypes_PlanetJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
diff --git a/examples b/examples
index eac35bd..fd5f6cd 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit eac35bda3173c1581e9e51b3dcf415740e9db0e9
+Subproject commit fd5f6cd92cbc692481c739da674a507e2cb459d0
diff --git a/java_awt b/java_awt
index 461f61d..f9b52c9 160000
--- a/java_awt
+++ b/java_awt
@@ -1 +1 @@
-Subproject commit 461f61d4473ed8cce975307fe770daaa67855f20
+Subproject commit f9b52c9422fa0a438492480bbb8c0adf8bef31a8
diff --git a/java_lang b/java_lang
index c9b8b55..6db935c 160000
--- a/java_lang
+++ b/java_lang
@@ -1 +1 @@
-Subproject commit c9b8b55fd8f40bc25ec2c49fa03a7d3a51b78766
+Subproject commit 6db935cf4059165652ed7e8830958db76edd0ec2
diff --git a/java_sql b/java_sql
index ffe975c..0222816 160000
--- a/java_sql
+++ b/java_sql
@@ -1 +1 @@
-Subproject commit ffe975cb112f9c89da63b01b9c54c640bf969d24
+Subproject commit 022281686495e5236ada276d66f3847a38852782
diff --git a/java_swift b/java_swift
index 1d31a0c..0d62467 160000
--- a/java_swift
+++ b/java_swift
@@ -1 +1 @@
-Subproject commit 1d31a0c46d90e3588a192509390aca022d03080b
+Subproject commit 0d62467b08ee6f123f1a505ce152ba9ed67be977
diff --git a/java_util b/java_util
index 61005cb..812eb50 160000
--- a/java_util
+++ b/java_util
@@ -1 +1 @@
-Subproject commit 61005cba6a74e0d080ac1949b2eadab46dc4602b
+Subproject commit 812eb50d52eda0ff78b755b547472c49678491f6
diff --git a/javax_swing b/javax_swing
index 09496dd..ab7f4e0 160000
--- a/javax_swing
+++ b/javax_swing
@@ -1 +1 @@
-Subproject commit 09496dd0c7077e4425aff254ebade9506fdd28de
+Subproject commit ab7f4e099dd6449818ecfa225ff2f9317d114323
diff --git a/org_swiftjava/Sources/SwiftTest.swift b/org_swiftjava/Sources/SwiftTest.swift
index 6ca927a..44a3eec 100644
--- a/org_swiftjava/Sources/SwiftTest.swift
+++ b/org_swiftjava/Sources/SwiftTest.swift
@@ -20,7 +20,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var String2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var String2dArrayFieldStatic: [[String]]! {
+    public static var String2dArrayFieldStatic: [[String]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "String2dArrayFieldStatic", fieldType: "[[Ljava/lang/String;", fieldCache: &String2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[String]].self, from: __value )
@@ -36,7 +36,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var StringArrayFieldStatic_FieldID: jfieldID?
 
-    open static var StringArrayFieldStatic: [String]! {
+    public static var StringArrayFieldStatic: [String]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "StringArrayFieldStatic", fieldType: "[Ljava/lang/String;", fieldCache: &StringArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [String].self, from: __value )
@@ -52,7 +52,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var StringFieldStatic_FieldID: jfieldID?
 
-    open static var StringFieldStatic: String! {
+    public static var StringFieldStatic: String! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "StringFieldStatic", fieldType: "Ljava/lang/String;", fieldCache: &StringFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -69,7 +69,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var TestListener2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var TestListener2dArrayFieldStatic: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
+    public static var TestListener2dArrayFieldStatic: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "TestListener2dArrayFieldStatic", fieldType: "[[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListener2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward]].self, from: __value )
@@ -85,7 +85,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var TestListenerArrayFieldStatic_FieldID: jfieldID?
 
-    open static var TestListenerArrayFieldStatic: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
+    public static var TestListenerArrayFieldStatic: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "TestListenerArrayFieldStatic", fieldType: "[Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [/* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocolForward].self, from: __value )
@@ -101,7 +101,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var TestListenerFieldStatic_FieldID: jfieldID?
 
-    open static var TestListenerFieldStatic: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
+    public static var TestListenerFieldStatic: /* interface com.johnholdsworth.swiftbindings.SwiftHelloTest$TestListener */ UnavailableProtocol! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "TestListenerFieldStatic", fieldType: "Lcom/johnholdsworth/swiftbindings/SwiftHelloTest$TestListener;", fieldCache: &TestListenerFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             defer { JNI.DeleteLocalRef( __value ) }
@@ -118,7 +118,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var boolean2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var boolean2dArrayFieldStatic: [[Bool]]! {
+    public static var boolean2dArrayFieldStatic: [[Bool]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "boolean2dArrayFieldStatic", fieldType: "[[Z", fieldCache: &boolean2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Bool]].self, from: __value )
@@ -134,7 +134,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var booleanArrayFieldStatic_FieldID: jfieldID?
 
-    open static var booleanArrayFieldStatic: [Bool]! {
+    public static var booleanArrayFieldStatic: [Bool]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "booleanArrayFieldStatic", fieldType: "[Z", fieldCache: &booleanArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Bool].self, from: __value )
@@ -150,7 +150,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var booleanFieldStatic_FieldID: jfieldID?
 
-    open static var booleanFieldStatic: Bool {
+    public static var booleanFieldStatic: Bool {
         get {
             let __value = JNIField.GetStaticBooleanField( fieldName: "booleanFieldStatic", fieldType: "Z", fieldCache: &booleanFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value != jboolean(JNI_FALSE)
@@ -166,7 +166,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var byte2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var byte2dArrayFieldStatic: [[Int8]]! {
+    public static var byte2dArrayFieldStatic: [[Int8]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "byte2dArrayFieldStatic", fieldType: "[[B", fieldCache: &byte2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Int8]].self, from: __value )
@@ -182,7 +182,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var byteArrayFieldStatic_FieldID: jfieldID?
 
-    open static var byteArrayFieldStatic: [Int8]! {
+    public static var byteArrayFieldStatic: [Int8]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "byteArrayFieldStatic", fieldType: "[B", fieldCache: &byteArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Int8].self, from: __value )
@@ -198,7 +198,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var byteFieldStatic_FieldID: jfieldID?
 
-    open static var byteFieldStatic: Int8 {
+    public static var byteFieldStatic: Int8 {
         get {
             let __value = JNIField.GetStaticByteField( fieldName: "byteFieldStatic", fieldType: "B", fieldCache: &byteFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
@@ -214,7 +214,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var char2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var char2dArrayFieldStatic: [[UInt16]]! {
+    public static var char2dArrayFieldStatic: [[UInt16]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "char2dArrayFieldStatic", fieldType: "[[C", fieldCache: &char2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[UInt16]].self, from: __value )
@@ -230,7 +230,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var charArrayFieldStatic_FieldID: jfieldID?
 
-    open static var charArrayFieldStatic: [UInt16]! {
+    public static var charArrayFieldStatic: [UInt16]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "charArrayFieldStatic", fieldType: "[C", fieldCache: &charArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [UInt16].self, from: __value )
@@ -246,7 +246,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var charFieldStatic_FieldID: jfieldID?
 
-    open static var charFieldStatic: UInt16 {
+    public static var charFieldStatic: UInt16 {
         get {
             let __value = JNIField.GetStaticCharField( fieldName: "charFieldStatic", fieldType: "C", fieldCache: &charFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
@@ -262,7 +262,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var double2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var double2dArrayFieldStatic: [[Double]]! {
+    public static var double2dArrayFieldStatic: [[Double]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "double2dArrayFieldStatic", fieldType: "[[D", fieldCache: &double2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Double]].self, from: __value )
@@ -278,7 +278,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var doubleArrayFieldStatic_FieldID: jfieldID?
 
-    open static var doubleArrayFieldStatic: [Double]! {
+    public static var doubleArrayFieldStatic: [Double]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "doubleArrayFieldStatic", fieldType: "[D", fieldCache: &doubleArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Double].self, from: __value )
@@ -294,7 +294,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var doubleFieldStatic_FieldID: jfieldID?
 
-    open static var doubleFieldStatic: Double {
+    public static var doubleFieldStatic: Double {
         get {
             let __value = JNIField.GetStaticDoubleField( fieldName: "doubleFieldStatic", fieldType: "D", fieldCache: &doubleFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
@@ -310,7 +310,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var float2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var float2dArrayFieldStatic: [[Float]]! {
+    public static var float2dArrayFieldStatic: [[Float]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "float2dArrayFieldStatic", fieldType: "[[F", fieldCache: &float2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Float]].self, from: __value )
@@ -326,7 +326,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var floatArrayFieldStatic_FieldID: jfieldID?
 
-    open static var floatArrayFieldStatic: [Float]! {
+    public static var floatArrayFieldStatic: [Float]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "floatArrayFieldStatic", fieldType: "[F", fieldCache: &floatArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Float].self, from: __value )
@@ -342,7 +342,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var floatFieldStatic_FieldID: jfieldID?
 
-    open static var floatFieldStatic: Float {
+    public static var floatFieldStatic: Float {
         get {
             let __value = JNIField.GetStaticFloatField( fieldName: "floatFieldStatic", fieldType: "F", fieldCache: &floatFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
@@ -358,7 +358,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var int2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var int2dArrayFieldStatic: [[Int32]]! {
+    public static var int2dArrayFieldStatic: [[Int32]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "int2dArrayFieldStatic", fieldType: "[[I", fieldCache: &int2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Int32]].self, from: __value )
@@ -374,7 +374,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var intArrayFieldStatic_FieldID: jfieldID?
 
-    open static var intArrayFieldStatic: [Int32]! {
+    public static var intArrayFieldStatic: [Int32]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "intArrayFieldStatic", fieldType: "[I", fieldCache: &intArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Int32].self, from: __value )
@@ -390,7 +390,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var intFieldStatic_FieldID: jfieldID?
 
-    open static var intFieldStatic: Int {
+    public static var intFieldStatic: Int {
         get {
             let __value = JNIField.GetStaticIntField( fieldName: "intFieldStatic", fieldType: "I", fieldCache: &intFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return Int(__value)
@@ -406,7 +406,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var long2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var long2dArrayFieldStatic: [[Int64]]! {
+    public static var long2dArrayFieldStatic: [[Int64]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "long2dArrayFieldStatic", fieldType: "[[J", fieldCache: &long2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Int64]].self, from: __value )
@@ -422,7 +422,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var longArrayFieldStatic_FieldID: jfieldID?
 
-    open static var longArrayFieldStatic: [Int64]! {
+    public static var longArrayFieldStatic: [Int64]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "longArrayFieldStatic", fieldType: "[J", fieldCache: &longArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Int64].self, from: __value )
@@ -438,7 +438,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var longFieldStatic_FieldID: jfieldID?
 
-    open static var longFieldStatic: Int64 {
+    public static var longFieldStatic: Int64 {
         get {
             let __value = JNIField.GetStaticLongField( fieldName: "longFieldStatic", fieldType: "J", fieldCache: &longFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
@@ -454,7 +454,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var short2dArrayFieldStatic_FieldID: jfieldID?
 
-    open static var short2dArrayFieldStatic: [[Int16]]! {
+    public static var short2dArrayFieldStatic: [[Int16]]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "short2dArrayFieldStatic", fieldType: "[[S", fieldCache: &short2dArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [[Int16]].self, from: __value )
@@ -470,7 +470,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var shortArrayFieldStatic_FieldID: jfieldID?
 
-    open static var shortArrayFieldStatic: [Int16]! {
+    public static var shortArrayFieldStatic: [Int16]! {
         get {
             let __value = JNIField.GetStaticObjectField( fieldName: "shortArrayFieldStatic", fieldType: "[S", fieldCache: &shortArrayFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return JNIType.toSwift( type: [Int16].self, from: __value )
@@ -486,7 +486,7 @@ open class SwiftTest: java_swift.JavaObject {
 
     private static var shortFieldStatic_FieldID: jfieldID?
 
-    open static var shortFieldStatic: Int16 {
+    public static var shortFieldStatic: Int16 {
         get {
             let __value = JNIField.GetStaticShortField( fieldName: "shortFieldStatic", fieldType: "S", fieldCache: &shortFieldStatic_FieldID, className: "org/swiftjava/SwiftTest", classCache: &SwiftTestJNIClass )
             return __value
diff --git a/src/genswift.java b/src/genswift.java
index 365b419..4173b69 100644
--- a/src/genswift.java
+++ b/src/genswift.java
@@ -1,7 +1,7 @@
 //
 //  genswift.java
 //  https://github.com/SwiftJava/SwiftJava
-//  $Id: //depot/SwiftJava/src/genswift.java#94 $
+//  $Id: //depot/SwiftJava/src/genswift.java#95 $
 //
 //  Created by John Holdsworth on 14/07/2016.
 //  Copyright (c) 2016 John Holdsworth. All rights reserved.
@@ -125,6 +125,7 @@ boolean isUnavailable( Class<?> type ) {
             put( Class.class.getName(), true );
             put( Object.class.getName(), true );
             put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
             put( String.class.getName(), true );
             put( Comparable.class.getName(), true );
             put( Error.class.getName(), true );
@@ -144,6 +145,7 @@ boolean isUnavailable( Class<?> type ) {
             put( Object.class.getName(), true );
             put( Class.class.getName(), true );
             put( Enum.class.getName(), true );
+            put( Thread.class.getName(), true );
             put( Runnable.class.getName(), true );
             put( Throwable.class.getName(), true );
             put( Exception.class.getName(), true );
@@ -481,7 +483,7 @@ boolean generate() throws Exception {
     				cases += (cases == "" ? "" : ", ") + ((Enum<?>)constant).name();
     			code.append("    case "+cases+"\n\n");
     			
-    			code.append("    static let enumConstants = try! JavaClass.forName(\""+clazz.getName()+"\")\n" +
+                code.append("    static let enumConstants = JavaClass(loading: \""+clazz.getName()+"\")\n" +
     	    			"        .getEnumConstants()!.map { "+classSuffix+"Forward( javaObject: $0.javaObject ) }\n\n");
     			
     			code.append("    public func underlier() -> "+classSuffix+"Forward"+" {\n");
@@ -1051,9 +1053,9 @@ public int compare(java.lang.reflect.Method o1, java.lang.reflect.Method o2) {
         String proxyClass = "org/swiftjava/" + currentFramework + "/" + classSuffix + "Proxy";
         code.append("        let clazz = JNI.FindClass( proxyClassName() )\n");
 
-        code.append("        withUnsafePointer(to: &natives[0]) {\n");
+        code.append("        natives.withUnsafeBufferPointer {\n");
         code.append("            nativesPtr in\n");
-        code.append("            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr, jint(natives.count) ) != jint(JNI_OK) {\n");
+        code.append("            if JNI.api.RegisterNatives( JNI.env, clazz, nativesPtr.baseAddress, jint(nativesPtr.count) ) != jint(JNI_OK) {\n");
         code.append("                JNI.report( \"Unable to register java natives\" )\n");
         code.append("            }\n");
         code.append("        }\n\n");
diff --git a/swift-android-Clibadder b/swift-android-Clibadder
new file mode 160000
index 0000000..e263f46
--- /dev/null
+++ b/swift-android-Clibadder
@@ -0,0 +1 @@
+Subproject commit e263f46164e6e26c103771430f1162af873f3047
diff --git a/swift-android-gradle b/swift-android-gradle
index 6a1a924..ee17299 160000
--- a/swift-android-gradle
+++ b/swift-android-gradle
@@ -1 +1 @@
-Subproject commit 6a1a924b9a0e59d77ba43694018e8925a09c76c3
+Subproject commit ee17299c6ca9af66048131e002b6607bfe8e78cd
diff --git a/swift-android-kotlin b/swift-android-kotlin
index 63a7879..5514cf5 160000
--- a/swift-android-kotlin
+++ b/swift-android-kotlin
@@ -1 +1 @@
-Subproject commit 63a7879f0404b8eec9533d85f0d3cc7f795e9df4
+Subproject commit 5514cf5c8da9609793470b384d991ffeb7a11281
diff --git a/swift-android-opengl b/swift-android-opengl
new file mode 160000
index 0000000..a9ed0c8
--- /dev/null
+++ b/swift-android-opengl
@@ -0,0 +1 @@
+Subproject commit a9ed0c8331f93d78792a29f686344092323acee4
diff --git a/swift-android-samples b/swift-android-samples
index ca9eb67..fb0c53b 160000
--- a/swift-android-samples
+++ b/swift-android-samples
@@ -1 +1 @@
-Subproject commit ca9eb677dae81ae116807aa758c0ae87df90994a
+Subproject commit fb0c53b782fdfd6505d6cc7f3c6dbc85c8c3b5cb
diff --git a/swift-android-zlib b/swift-android-zlib
new file mode 160000
index 0000000..f2b83e7
--- /dev/null
+++ b/swift-android-zlib
@@ -0,0 +1 @@
+Subproject commit f2b83e7c40bb8b0bb742dedc5a331ed306d67ad1