diff --git a/fiber_orm.nimble b/fiber_orm.nimble
index 249a05e..79aa952 100644
--- a/fiber_orm.nimble
+++ b/fiber_orm.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "1.0.3"
+version       = "1.0.4"
 author        = "Jonathan Bernard"
 description   = "Lightweight Postgres ORM for Nim."
 license       = "GPL-3.0"
@@ -10,5 +10,5 @@ srcDir        = "src"
 
 # Dependencies
 
-requires "nim >= 1.4.0"
+requires @["nim >= 1.4.0", "uuids"]
 requires "https://git.jdb-software.com/jdb/nim-namespaced-logging.git"
diff --git a/src/fiber_orm.nim b/src/fiber_orm.nim
index a7adeff..bd687cb 100644
--- a/src/fiber_orm.nim
+++ b/src/fiber_orm.nim
@@ -432,8 +432,8 @@ macro generateProcsForModels*(dbType: type, modelTypes: openarray[type]): untype
   for t in modelTypes:
     let modelName = $(t.getType[1])
     let getName = ident("get" & modelName)
-    let getAllName = ident("getAll" & modelName & "s")
-    let findWhereName = ident("find" & modelName & "sWhere")
+    let getAllName = ident("getAll" & pluralize(modelName))
+    let findWhereName = ident("find" & pluralize(modelName) & "Where")
     let createName = ident("create" & modelName)
     let updateName = ident("update" & modelName)
     let deleteName = ident("delete" & modelName)