diff --git a/src/main/scala/model/Profile.scala b/src/main/scala/model/Profile.scala
index 20ff24b..3d2a2e7 100644
--- a/src/main/scala/model/Profile.scala
+++ b/src/main/scala/model/Profile.scala
@@ -1,9 +1,7 @@
 package model
 
-import slick.driver.JdbcProfile
-
 trait Profile {
-  val profile: JdbcProfile
+  val profile = slick.driver.H2Driver
   import profile.simple._
 
   // java.util.Date Mapped Column Types
diff --git a/src/main/scala/model/package.scala b/src/main/scala/model/package.scala
index 924935e..b806c33 100644
--- a/src/main/scala/model/package.scala
+++ b/src/main/scala/model/package.scala
@@ -1,10 +1,5 @@
-package object model extends {
-  // TODO [Slick 2.0]Should be configurable?
-  val profile = slick.driver.H2Driver
-  // TODO [Slick 2.0]To avoid compilation error about delete invocation. Why can't this error be resolved by import profile.simple._?
-  val simple = profile.simple
-
-} with AccountComponent
+package object model extends Profile
+  with AccountComponent
   with ActivityComponent
   with CollaboratorComponent
   with GroupMemberComponent
@@ -16,9 +11,11 @@
   with PullRequestComponent
   with RepositoryComponent
   with SshKeyComponent
-  with WebHookComponent with Profile {
+  with WebHookComponent {
+
   /**
    * Returns system date.
    */
   def currentDate = new java.util.Date()
+
 }
diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala
index ad0d363..71934f1 100644
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 // TODO [Slick 2.0]NOT import directly?
 import model.dateColumnType
 import service.SystemSettingsService.SystemSettings
diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 702462a..d9219dc 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait ActivityService {
 
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index c75165c..2c4a7fd 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -4,7 +4,7 @@
 import Q.interpolation
 
 import model._
-import simple._
+import profile.simple._
 import util.Implicits._
 import util.StringUtil._
 
diff --git a/src/main/scala/service/LabelsService.scala b/src/main/scala/service/LabelsService.scala
index ff41173..251e5fd 100644
--- a/src/main/scala/service/LabelsService.scala
+++ b/src/main/scala/service/LabelsService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait LabelsService {
 
diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala
index b65fc7b..2f73f22 100644
--- a/src/main/scala/service/MilestonesService.scala
+++ b/src/main/scala/service/MilestonesService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 // TODO [Slick 2.0]NOT import directly?
 import model.dateColumnType
 
diff --git a/src/main/scala/service/PullRequestService.scala b/src/main/scala/service/PullRequestService.scala
index e40ca3c..c91abe1 100644
--- a/src/main/scala/service/PullRequestService.scala
+++ b/src/main/scala/service/PullRequestService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._
diff --git a/src/main/scala/service/RepositorySearchService.scala b/src/main/scala/service/RepositorySearchService.scala
index 46821cd..292507c 100644
--- a/src/main/scala/service/RepositorySearchService.scala
+++ b/src/main/scala/service/RepositorySearchService.scala
@@ -8,7 +8,7 @@
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
 import model._
-import simple._
+import profile.simple._
 
 trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index d30d267..5a9fec6 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 import util.JGitUtil
 
 trait RepositoryService { self: AccountService =>
diff --git a/src/main/scala/service/SshKeyService.scala b/src/main/scala/service/SshKeyService.scala
index 23feffa..d38804a 100644
--- a/src/main/scala/service/SshKeyService.scala
+++ b/src/main/scala/service/SshKeyService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 
 trait SshKeyService {
 
diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala
index eaa3e59..9061a07 100644
--- a/src/main/scala/service/WebHookService.scala
+++ b/src/main/scala/service/WebHookService.scala
@@ -1,7 +1,7 @@
 package service
 
 import model._
-import simple._
+import profile.simple._
 import org.slf4j.LoggerFactory
 import service.RepositoryService.RepositoryInfo
 import util.JGitUtil
diff --git a/src/main/scala/servlet/PluginActionInvokeFilter.scala b/src/main/scala/servlet/PluginActionInvokeFilter.scala
index ef25204..6a35121 100644
--- a/src/main/scala/servlet/PluginActionInvokeFilter.scala
+++ b/src/main/scala/servlet/PluginActionInvokeFilter.scala
@@ -50,7 +50,7 @@
   }
 
   private def processRepositoryAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
-                                     (implicit session: model.simple.Session): Boolean = {
+                                     (implicit session: model.profile.simple.Session): Boolean = {
     val elements = path.split("/")
     if(elements.length > 3){
       val owner  = elements(1)