diff --git a/src/main/scala/model/BasicTemplate.scala b/src/main/scala/model/BasicTemplate.scala
index e0460a9..6266ebc 100644
--- a/src/main/scala/model/BasicTemplate.scala
+++ b/src/main/scala/model/BasicTemplate.scala
@@ -8,40 +8,40 @@
     val repositoryName = column[String]("REPOSITORY_NAME")
 
     def byRepository(owner: String, repository: String) =
-      (userName is owner.bind) && (repositoryName is repository.bind)
+      (userName === owner.bind) && (repositoryName === repository.bind)
 
     def byRepository(userName: Column[String], repositoryName: Column[String]) =
-      (this.userName is userName) && (this.repositoryName is repositoryName)
+      (this.userName === userName) && (this.repositoryName === repositoryName)
   }
 
   trait IssueTemplate extends BasicTemplate { self: Table[_] =>
     val issueId = column[Int]("ISSUE_ID")
 
     def byIssue(owner: String, repository: String, issueId: Int) =
-      byRepository(owner, repository) && (this.issueId is issueId.bind)
+      byRepository(owner, repository) && (this.issueId === issueId.bind)
 
     def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.issueId is issueId)
+      byRepository(userName, repositoryName) && (this.issueId === issueId)
   }
 
   trait LabelTemplate extends BasicTemplate { self: Table[_] =>
     val labelId = column[Int]("LABEL_ID")
 
     def byLabel(owner: String, repository: String, labelId: Int) =
-      byRepository(owner, repository) && (this.labelId is labelId.bind)
+      byRepository(owner, repository) && (this.labelId === labelId.bind)
 
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.labelId is labelId)
+      byRepository(userName, repositoryName) && (this.labelId === labelId)
   }
 
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
     val milestoneId = column[Int]("MILESTONE_ID")
 
     def byMilestone(owner: String, repository: String, milestoneId: Int) =
-      byRepository(owner, repository) && (this.milestoneId is milestoneId.bind)
+      byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
 
     def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.milestoneId is milestoneId)
+      byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
   }
 
 }
diff --git a/src/main/scala/model/Collaborator.scala b/src/main/scala/model/Collaborator.scala
index 1b96872..88311e1 100644
--- a/src/main/scala/model/Collaborator.scala
+++ b/src/main/scala/model/Collaborator.scala
@@ -10,7 +10,7 @@
     def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
 
     def byPrimaryKey(owner: String, repository: String, collaborator: String) =
-      byRepository(owner, repository) && (collaboratorName is collaborator.bind)
+      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
   }
 }
 
diff --git a/src/main/scala/model/IssueComment.scala b/src/main/scala/model/IssueComment.scala
index 8d5e2be..4c8ca6e 100644
--- a/src/main/scala/model/IssueComment.scala
+++ b/src/main/scala/model/IssueComment.scala
@@ -17,7 +17,7 @@
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
 
-    def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
+    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
 }
 
diff --git a/src/main/scala/model/IssueLabels.scala b/src/main/scala/model/IssueLabels.scala
index d6b83c1..5d42272 100644
--- a/src/main/scala/model/IssueLabels.scala
+++ b/src/main/scala/model/IssueLabels.scala
@@ -8,7 +8,7 @@
   class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
     def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
     def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
-      byIssue(owner, repository, issueId) && (this.labelId is labelId.bind)
+      byIssue(owner, repository, issueId) && (this.labelId === labelId.bind)
   }
 }
 
diff --git a/src/main/scala/model/SshKey.scala b/src/main/scala/model/SshKey.scala
index d1d0aab..dcf3463 100644
--- a/src/main/scala/model/SshKey.scala
+++ b/src/main/scala/model/SshKey.scala
@@ -12,7 +12,7 @@
     val publicKey = column[String]("PUBLIC_KEY")
     def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
 
-    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
   }
 }
 
diff --git a/src/main/scala/model/WebHook.scala b/src/main/scala/model/WebHook.scala
index 8eb3719..4c13c87 100644
--- a/src/main/scala/model/WebHook.scala
+++ b/src/main/scala/model/WebHook.scala
@@ -9,7 +9,7 @@
     val url = column[String]("URL")
     def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
 
-    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
   }
 }
 
diff --git a/src/main/scala/service/AccountService.scala b/src/main/scala/service/AccountService.scala
index d7e4eb7..b815c54 100644
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -75,10 +75,10 @@
   }
 
   def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.userName === userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+    Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
   def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
   def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
     if(includeRemoved){
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index 55b60fb..292b93a 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -168,7 +168,7 @@
           .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
       (t1.closed           === (condition.state == "closed").bind) &&
       (t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
-      (t1.milestoneId      isEmpty, condition.milestoneId == Some(None)) &&
+      (t1.milestoneId.?    isEmpty, condition.milestoneId == Some(None)) &&
       (t1.assignedUserName === filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
       (t1.openedUserName   === filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
       (t1.openedUserName   =!= filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala
index e9b27be..476e0c4 100644
--- a/src/main/scala/service/MilestonesService.scala
+++ b/src/main/scala/service/MilestonesService.scala
@@ -41,7 +41,7 @@
 
   def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
     val counts = Issues
-      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) }
+      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
       .groupBy { t => t.milestoneId -> t.closed }
       .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
       .toMap
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index 9e340fe..8e204a8 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -102,7 +102,7 @@
         }.map { t => t.activityId -> t.message }.list
 
         updateActivities.foreach { case (activityId, message) =>
-          Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          Activities.filter(_.activityId === activityId.bind).map(_.message).update(
             message
               .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
               .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
diff --git a/src/main/scala/service/WebHookService.scala b/src/main/scala/service/WebHookService.scala
index 9f3f11e..2013017 100644
--- a/src/main/scala/service/WebHookService.scala
+++ b/src/main/scala/service/WebHookService.scala
@@ -44,7 +44,7 @@
       val httpClient = HttpClientBuilder.create.build
 
       webHookURLs.foreach { webHookUrl =>
-        val f = future {
+        val f = Future {
           logger.debug(s"start web hook invocation for ${webHookUrl}")
           val httpPost = new HttpPost(webHookUrl.url)
 
diff --git a/src/main/scala/util/Notifier.scala b/src/main/scala/util/Notifier.scala
index ae6e25c..95ec6bf 100644
--- a/src/main/scala/util/Notifier.scala
+++ b/src/main/scala/util/Notifier.scala
@@ -69,7 +69,7 @@
       (msg: String => String)(implicit context: Context) = {
     val database = Database(context.request.getServletContext)
 
-    val f = future {
+    val f = Future {
       database withSession { implicit session =>
         getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
           defining(