diff --git a/resources/lib/database.py b/resources/lib/database.py
new file mode 100644
index 00000000..09d58550
--- /dev/null
+++ b/resources/lib/database.py
@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+
+#################################################################################################
+
+import sqlite3
+import threading
+
+import xbmc
+
+import utils
+
+#################################################################################################
+
+KODI = xbmc.getInfoLabel('System.BuildVersion')[:2]
+
+#################################################################################################
+
+
+def video_database():
+        
+    db_version = {
+
+        '13': 78, # Gotham
+        '14': 90, # Helix
+        '15': 93, # Isengard
+        '16': 99, # Jarvis
+        '17': 104 # Krypton
+    }
+
+    path = xbmc.translatePath("special://database/MyVideos%s.db"
+        % db_version.get(KODI, "")).decode('utf-8')
+
+    return path
+
+def music_database():
+    
+    db_version = {
+
+        '13': 46, # Gotham
+        '14': 48, # Helix
+        '15': 52, # Isengard
+        '16': 56, # Jarvis
+        '17': 60  # Krypton
+    }
+
+    path = xbmc.translatePath("special://database/MyMusic%s.db"
+        % db_version.get(KODI, "")).decode('utf-8')
+
+    return path
+
+
+class DatabaseConn(object):
+    # To be called as context manager - i.e. with DatabaseConn() as dbconn
+
+    def __init__(self, database_file="video", commit_mode=""):
+        """
+        database_file can be custom: emby, texture, music, video, custom like :memory: or path
+        commit_mode set to None to autocommit (isolation_level). See python documentation.
+        """
+        self.log = utils.Logging('Database').log
+
+        self.db_file = database_file
+        self.commit_mode = commit_mode
+
+    def __enter__(self):
+        # Open the connection
+        self.path = self._SQL(self.db_file)
+        self.log("Opening database: %s" % self.path, 1)
+        self.conn = sqlite3.connect(self.path, isolation_level=self.commit_mode, timeout=20)
+        return self.conn
+
+    def _SQL(self, media_type):
+
+        if media_type == "emby":
+            return xbmc.translatePath("special://database/emby.db").decode('utf-8')
+        elif media_type == "texture":
+            return xbmc.translatePath("special://database/Textures13.db").decode('utf-8')
+        elif media_type == "music":
+            return music_database()
+        elif media_type == "video":
+            return video_database()
+        else: # custom path
+            return self.db_file
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # Close the connection
+        if exc_type is not None:
+            # Errors were raised in the with statement
+            self.log("Type: %s Value: %s Traceback: %s" % (exc_type, exc_val, exc_tb), -1)
+            self.conn.rollback()
+
+        elif self.commit_mode is not None:
+            self.log("Commit: %s" % self.path, 1)
+            self.conn.commit()
+
+        self.conn.close()
+
+def dbquery(query, connection=None, conn_type=None, *args):
+    
+    """
+    connection is sqlite.connect
+    conn_type is only required if a connection is not provided
+    *args are tuple values that contain the corresponding data for the query
+    i.e     args_executemany = (('value1', 'value2'),('value1', 'value2'))
+            args_execute = ('value1', 'value2')
+    tip: to build args_executemany, build a list of sets [(v1,v2),(v1,v2)], then pass it as *args
+    """
+    
+    if connection is None:
+        if conn_type is None:
+            return False
+        else:
+            connection = DatabaseConn(conn_type)
+
+    attempts = 3
+    while True:
+        try:
+            with connection as conn:
+                # raise sqlite3.OperationalError("database is locked")
+                if not args:
+                    return conn.execute(query)
+                elif isinstance(args[0], tuple):
+                    # Multiple entries for the same query
+                    return conn.executemany(query, args)
+                else:
+                    return conn.execute(query, args)
+            
+        except sqlite3.OperationalError as e:
+            if "database is locked" in str(e):
+                # Database is locked, retry
+                attempts -= 1
+                xbmc.sleep(1000)
+            else:
+                raise
+
+        if not attempts:
+            return False
\ No newline at end of file
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index 9a6c75de..7cfb60f7 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -860,6 +860,7 @@ class LibrarySync(threading.Thread):
         cursor.execute("CREATE TABLE IF NOT EXISTS version(idVersion TEXT)")
         
         conn.commit()
+        cursor.close()
 
     def run(self):