diff --git a/src/main/scala/model/Issue.scala b/src/main/scala/model/Issue.scala
index ab989ce..fdb644e 100644
--- a/src/main/scala/model/Issue.scala
+++ b/src/main/scala/model/Issue.scala
@@ -4,7 +4,7 @@
 
 object IssueId extends Table[(String, String, Int)]("ISSUE_ID") with IssueTemplate {
   def * = userName ~ repositoryName ~ issueId
-  def byPrimaryKey = byRepository _
+  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
 }
 
 object Issues extends Table[Issue]("ISSUE") with IssueTemplate with MilestoneTemplate with Functions {
@@ -17,7 +17,7 @@
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
   def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _)
 
-  def byPrimaryKey = byIssue _
+  def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
 }
 
 case class Issue(
diff --git a/src/main/scala/model/Repository.scala b/src/main/scala/model/Repository.scala
index 79a42fb..6f41ee9 100644
--- a/src/main/scala/model/Repository.scala
+++ b/src/main/scala/model/Repository.scala
@@ -11,7 +11,7 @@
   def lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
   def * = userName ~ repositoryName ~ isPrivate ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> (Repository, Repository.unapply _)
 
-  def byPrimaryKey = byRepository _
+  def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
 }
 
 case class Repository(