diff --git a/ee/core/models.py b/ee/cli/plugins/models.py
similarity index 59%
rename from ee/core/models.py
rename to ee/cli/plugins/models.py
index 2592a26c..2b3e02d6 100644
--- a/ee/core/models.py
+++ b/ee/cli/plugins/models.py
@@ -7,6 +7,7 @@ class SiteDB(Base):
         Databse model for site table
     """
     __tablename__ = 'sites'
+    __table_args__ = {'extend_existing': True}
     id = Column(Integer, primary_key=True)
     sitename = Column(String, unique=True)
 
@@ -23,18 +24,21 @@ class SiteDB(Base):
     is_ssl = Column(Boolean, unique=False, default=False)
     storage_fs = Column(String)
     storage_db = Column(String)
+    db_name = Column(String)
+    db_password = Column(String)
+    db_user = Column(String)
 
-    def __init__(self, sitename=None, site_type=None, cache_type=None,
-                 site_path=None, site_enabled=None,
-                 is_ssl=None, storage_fs=None, storage_db=None):
-        self.sitename = sitename
-        self.site_type = site_type
-        self.cache_type = cache_type
-        self.site_path = site_path
-        self.is_enabled = site_enabled
-        self.is_ssl = is_ssl
-        self.storage_fs = storage_fs
-        self.storage_db = storage_db
+    # def __init__(self, sitename=None, site_type=None, cache_type=None,
+    #              site_path=None, site_enabled=None,
+    #              is_ssl=None, storage_fs=None, storage_db=None):
+    #     self.sitename = sitename
+    #     self.site_type = site_type
+    #     self.cache_type = cache_type
+    #     self.site_path = site_path
+    #     self.is_enabled = site_enabled
+    #     self.is_ssl = is_ssl
+    #     self.storage_fs = storage_fs
+    #     self.storage_db = storage_db
 
     # def __repr__(self):
     #     return '<Site %r>' % (self.site_type)
diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index cbf7e53b..9df6355d 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -18,6 +18,7 @@ import subprocess
 def ee_site_hook(app):
     # do something with the ``app`` object here.
     from ee.core.database import init_db
+    import ee.cli.plugins.models
     init_db()
 
 
diff --git a/ee/core/database.py b/ee/core/database.py
index 573ee099..888dca38 100644
--- a/ee/core/database.py
+++ b/ee/core/database.py
@@ -19,6 +19,6 @@ def init_db():
     """
     # import all modules here that might define models so that
     # they will be registered properly on the metadata.  Otherwise
-    # you will have to import them first before calling init_db()
-    import ee.core.models
+    # # you will have to import them first before calling init_db()
+    # import ee.core.models
     Base.metadata.create_all(bind=engine)