diff --git a/db/db.py b/db/db.py
index a5df74a..9ff48bc 100644
--- a/db/db.py
+++ b/db/db.py
@@ -134,7 +134,7 @@ class DB(object):
     def __init__(self, username=None, password=None, hostname="localhost",
             port=None, filename=None, dbname=None, dbtype=None, schemas=None,
             profile="default", exclude_system_tables=True, limit=1000,
-            keys_per_column=None, driver=None, cache=False):
+            keys_per_column=None, driver=None, cache=False, extensions=[]):
 
         if port is None:
             if dbtype=="postgres":
@@ -173,6 +173,7 @@ def __init__(self, username=None, password=None, hostname="localhost",
             self.limit = limit
             self.keys_per_column = keys_per_column
             self.driver = driver
+            self.extensions = extensions
 
         if self.dbtype is None:
             raise Exception("Database type not specified! Must select one of: postgres, sqlite, mysql, mssql, or redshift")
@@ -189,6 +190,10 @@ def __init__(self, username=None, password=None, hostname="localhost",
             if not HAS_SQLITE:
                 raise Exception("Couldn't find sqlite library. Please ensure it is installed")
             self.con = sqlite.connect(self.filename)
+            if self.extensions:
+                self.con.enable_load_extension(True)
+                for ext in self.extensions:
+                    self.con.load_extension(ext)
             self.cur = self.con.cursor()
             self._create_sqlite_metatable()
         elif self.dbtype=="mysql":
diff --git a/db/queries/mssql.py b/db/queries/mssql.py
index 75a5ff5..3c996e4 100644
--- a/db/queries/mssql.py
+++ b/db/queries/mssql.py
@@ -15,8 +15,8 @@
     },
     "system": {
         "schema_no_system": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from
@@ -25,16 +25,16 @@
                     table_schema not in ('information_schema', 'sys')
                 """,
         "schema_with_system": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from
                     information_schema.columns;
                 """,
         "schema_specified": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from