diff --git a/src/main/kotlin/application/Converters.kt b/src/main/kotlin/application/Converters.kt
index 75fe342..2b6521a 100644
--- a/src/main/kotlin/application/Converters.kt
+++ b/src/main/kotlin/application/Converters.kt
@@ -44,14 +44,6 @@ val converters: ConverterDeclaration = {
 
     // TODO remove converters of entities
 
-    convert<ConstitutionRef> {
-        decode { values, _ ->
-            values.singleOrNull()?.let {
-                ConstitutionRef(UUID.fromString(it))
-            } ?: throw NotFoundException("""UUID "$values" is not valid for Constitution""")
-        }
-    }
-
     convert<Constitution> {
         decode { values, _ ->
             val id = values.singleOrNull()?.let { UUID.fromString(it) }
diff --git a/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt b/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt
index 6b9c76c..88c7149 100644
--- a/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt
+++ b/src/main/kotlin/component/comment/constitution/routes/CreateConstitutionComment.kt
@@ -16,11 +16,14 @@ import io.ktor.locations.post
 import io.ktor.request.receiveText
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object CreateConstitutionComment {
     @Location("/constitutions/{constitution}/comments")
-    class CreateConstitutionCommentRequest(val constitution: ConstitutionRef)
+    class CreateConstitutionCommentRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
 
     fun Route.createConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
         post<CreateConstitutionCommentRequest> {
diff --git a/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt b/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt
index b235589..6709a27 100644
--- a/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt
+++ b/src/main/kotlin/component/comment/constitution/routes/GetConstitutionComment.kt
@@ -12,11 +12,14 @@ import io.ktor.locations.Location
 import io.ktor.locations.get
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object GetConstitutionComment {
     @Location("/constitutions/{constitution}/comments")
-    class GetConstitutionCommentRequest(val constitution: ConstitutionRef)
+    class GetConstitutionCommentRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
 
     fun Route.getConstitutionComment(repo: CommentConstitutionRepository, ac: CommentAccessControl) {
         get<GetConstitutionCommentRequest> {
diff --git a/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt
index 981e640..98071ec 100644
--- a/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt
+++ b/src/main/kotlin/component/follow/routes/constitution/FollowConstitution.kt
@@ -14,11 +14,14 @@ import io.ktor.locations.Location
 import io.ktor.locations.post
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object FollowConstitution {
     @Location("/constitutions/{constitution}/follows")
-    class ConstitutionFollowRequest(val constitution: ConstitutionRef)
+    class ConstitutionFollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
 
     fun Route.followConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
         post<ConstitutionFollowRequest> {
diff --git a/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt
index cd3e67d..f151327 100644
--- a/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt
+++ b/src/main/kotlin/component/follow/routes/constitution/GetFollowConstitution.kt
@@ -13,11 +13,14 @@ import io.ktor.locations.Location
 import io.ktor.locations.get
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object GetFollowConstitution {
     @Location("/constitutions/{constitution}/follows")
-    class ConstitutionFollowRequest(val constitution: ConstitutionRef)
+    class ConstitutionFollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
 
     fun Route.getFollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
         get<ConstitutionFollowRequest> {
diff --git a/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt b/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt
index 2c0afd9..17bb7ef 100644
--- a/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt
+++ b/src/main/kotlin/component/follow/routes/constitution/UnfollowConstitution.kt
@@ -14,11 +14,14 @@ import io.ktor.locations.Location
 import io.ktor.locations.delete
 import io.ktor.response.respond
 import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object UnfollowConstitution {
     @Location("/constitutions/{constitution}/follows")
-    class ConstitutionUnfollowRequest(val constitution: ConstitutionRef)
+    class ConstitutionUnfollowRequest(constitution: UUID) {
+        val constitution = ConstitutionRef(constitution)
+    }
 
     fun Route.unfollowConstitution(repo: FollowConstitutionRepository, ac: FollowAccessControl) {
         delete<ConstitutionUnfollowRequest> {