diff --git a/SQLiteCipher.xcodeproj/project.pbxproj b/SQLiteCipher.xcodeproj/project.pbxproj
index e2d6cc7..e980949 100644
--- a/SQLiteCipher.xcodeproj/project.pbxproj
+++ b/SQLiteCipher.xcodeproj/project.pbxproj
@@ -32,6 +32,8 @@
 		80EC45611C4316CD00BADFB1 /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80EC45601C4316CD00BADFB1 /* Cipher.swift */; };
 		80EC45631C43188800BADFB1 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = 80EC45621C43188800BADFB1 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		80EC45691C43197700BADFB1 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80EC44D51C4315A900BADFB1 /* libsqlcipher.a */; };
+		9C1B9D511CA5C93500EF0A1E /* Foundation+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */; };
+		9CEC27C01CA5D3BB002AA033 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80EC44C01C43159800BADFB1 /* SQLite.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -84,6 +86,27 @@
 			remoteGlobalIDString = D2AAC045055464E500DB518D;
 			remoteInfo = sqlcipher;
 		};
+		9C1B9D821CA5CDED00EF0A1E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 03A65E5A1C6BB0F50062603F;
+			remoteInfo = "SQLite tvOS";
+		};
+		9C1B9D841CA5CDED00EF0A1E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 03A65E631C6BB0F60062603F;
+			remoteInfo = "SQLiteTests tvOS";
+		};
+		9C1B9D861CA5CDED00EF0A1E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 80EC44B31C43159800BADFB1 /* SQLite.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A121AC451CA35C79005A31D1;
+			remoteInfo = "SQLite watchOS";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -116,6 +139,7 @@
 		80EC45481C43169C00BADFB1 /* Setter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Setter.swift; sourceTree = "<group>"; };
 		80EC45601C4316CD00BADFB1 /* Cipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cipher.swift; sourceTree = "<group>"; };
 		80EC45621C43188800BADFB1 /* SQLite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLite.h; sourceTree = "<group>"; };
+		9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Foundation+extension.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -123,6 +147,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9CEC27C01CA5D3BB002AA033 /* SQLite.framework in Frameworks */,
 				80EC45691C43197700BADFB1 /* libsqlcipher.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -164,6 +189,7 @@
 				80EC449C1C4314EE00BADFB1 /* SQLiteCipher.h */,
 				80EC449E1C4314EE00BADFB1 /* Info.plist */,
 				80EC45601C4316CD00BADFB1 /* Cipher.swift */,
+				9C1B9D501CA5C93500EF0A1E /* Foundation+extension.swift */,
 				80EC454A1C43169C00BADFB1 /* SQLite */,
 			);
 			path = SQLiteCipher;
@@ -185,6 +211,9 @@
 				80EC452F1C43169400BADFB1 /* SQLiteTests iOS.xctest */,
 				80EC44C41C43159800BADFB1 /* SQLite.framework */,
 				80EC45311C43169400BADFB1 /* SQLiteTests Mac.xctest */,
+				9C1B9D831CA5CDED00EF0A1E /* SQLite.framework */,
+				9C1B9D851CA5CDED00EF0A1E /* SQLiteTests tvOS.xctest */,
+				9C1B9D871CA5CDED00EF0A1E /* SQLite.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -384,6 +413,27 @@
 			remoteRef = 80EC45301C43169400BADFB1 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		9C1B9D831CA5CDED00EF0A1E /* SQLite.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SQLite.framework;
+			remoteRef = 9C1B9D821CA5CDED00EF0A1E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		9C1B9D851CA5CDED00EF0A1E /* SQLiteTests tvOS.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "SQLiteTests tvOS.xctest";
+			remoteRef = 9C1B9D841CA5CDED00EF0A1E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		9C1B9D871CA5CDED00EF0A1E /* SQLite.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = SQLite.framework;
+			remoteRef = 9C1B9D861CA5CDED00EF0A1E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -412,6 +462,7 @@
 				80EC454F1C43169C00BADFB1 /* Blob.swift in Sources */,
 				80EC45611C4316CD00BADFB1 /* Cipher.swift in Sources */,
 				80EC45561C43169C00BADFB1 /* R*Tree.swift in Sources */,
+				9C1B9D511CA5C93500EF0A1E /* Foundation+extension.swift in Sources */,
 				80EC45521C43169C00BADFB1 /* SQLite-Bridging.m in Sources */,
 				80EC45541C43169C00BADFB1 /* Value.swift in Sources */,
 				80EC455B1C43169C00BADFB1 /* Expression.swift in Sources */,
@@ -563,6 +614,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteCipher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_INCLUDE_PATHS = "";
 			};
 			name = Debug;
 		};
@@ -581,6 +633,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteCipher;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_INCLUDE_PATHS = "";
 			};
 			name = Release;
 		};
diff --git a/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme
new file mode 100644
index 0000000..49c1dc2
--- /dev/null
+++ b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "80EC44981C4314EE00BADFB1"
+               BuildableName = "SQLiteCipher.framework"
+               BlueprintName = "SQLiteCipher"
+               ReferencedContainer = "container:SQLiteCipher.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "80EC44981C4314EE00BADFB1"
+            BuildableName = "SQLiteCipher.framework"
+            BlueprintName = "SQLiteCipher"
+            ReferencedContainer = "container:SQLiteCipher.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "80EC44981C4314EE00BADFB1"
+            BuildableName = "SQLiteCipher.framework"
+            BlueprintName = "SQLiteCipher"
+            ReferencedContainer = "container:SQLiteCipher.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme
new file mode 100644
index 0000000..2fb4d44
--- /dev/null
+++ b/SQLiteCipher.xcodeproj/xcshareddata/xcschemes/SQLiteCipherTests.xcscheme
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "80EC44A21C4314EE00BADFB1"
+               BuildableName = "SQLiteCipherTests.xctest"
+               BlueprintName = "SQLiteCipherTests"
+               ReferencedContainer = "container:SQLiteCipher.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SQLiteCipher/Cipher.swift b/SQLiteCipher/Cipher.swift
index 5fdda13..d3a8f8d 100644
--- a/SQLiteCipher/Cipher.swift
+++ b/SQLiteCipher/Cipher.swift
@@ -22,7 +22,7 @@
 // THE SOFTWARE.
 //
 
-import SQLite3
+//import SQLite3
 
 extension Connection {
     
diff --git a/SQLiteCipher/Foundation+extension.swift b/SQLiteCipher/Foundation+extension.swift
new file mode 100644
index 0000000..6c54143
--- /dev/null
+++ b/SQLiteCipher/Foundation+extension.swift
@@ -0,0 +1,15 @@
+//
+//  Foundation+extension.swift
+//  SQLiteCipher
+//
+//  Created by Geoffrey Blotter on 3/25/16.
+//  Copyright © 2016 Stephen Celis. All rights reserved.
+//
+
+import Foundation
+
+extension NSData {
+	
+	public typealias Datatype = Blob.Datatype
+	
+}
diff --git a/Vendor/SQLite.swift b/Vendor/SQLite.swift
index 1ae2063..b43a31f 160000
--- a/Vendor/SQLite.swift
+++ b/Vendor/SQLite.swift
@@ -1 +1 @@
-Subproject commit 1ae20631b6a7942ae375d881dbfafbec8449bc58
+Subproject commit b43a31f9020c42790d763a2cbf4af0b57aed5ab9