diff --git a/src/main/kotlin/fr/dcproject/entity/Article.kt b/src/main/kotlin/fr/dcproject/entity/Article.kt
index fb9491b..b6e6183 100644
--- a/src/main/kotlin/fr/dcproject/entity/Article.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Article.kt
@@ -1,5 +1,5 @@
 package fr.dcproject.entity
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.mutable.*
 import java.util.*
 
 class Article(
diff --git a/src/main/kotlin/fr/dcproject/entity/Citizen.kt b/src/main/kotlin/fr/dcproject/entity/Citizen.kt
index af9e695..bd21788 100644
--- a/src/main/kotlin/fr/dcproject/entity/Citizen.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Citizen.kt
@@ -1,6 +1,6 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.mutable.*
 import org.joda.time.DateTime
 import java.util.*
 
diff --git a/src/main/kotlin/fr/dcproject/entity/Comment.kt b/src/main/kotlin/fr/dcproject/entity/Comment.kt
index 5ac4f2d..38cad45 100644
--- a/src/main/kotlin/fr/dcproject/entity/Comment.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Comment.kt
@@ -1,6 +1,6 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.mutable.*
 import java.util.*
 
 open class Comment <T : UuidEntity> (
diff --git a/src/main/kotlin/fr/dcproject/entity/Constitution.kt b/src/main/kotlin/fr/dcproject/entity/Constitution.kt
index f1b3a3a..cd1bf34 100644
--- a/src/main/kotlin/fr/dcproject/entity/Constitution.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Constitution.kt
@@ -1,6 +1,6 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.mutable.*
 import java.util.*
 
 class Constitution(
diff --git a/src/main/kotlin/fr/dcproject/entity/Extra.kt b/src/main/kotlin/fr/dcproject/entity/Extra.kt
index d83f705..11b67b2 100644
--- a/src/main/kotlin/fr/dcproject/entity/Extra.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Extra.kt
@@ -1,6 +1,7 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.EntityI
+import fr.postgresjson.entity.mutable.*
 import java.util.*
 
 interface ExtraI <T : EntityI> :
diff --git a/src/main/kotlin/fr/dcproject/entity/Follow.kt b/src/main/kotlin/fr/dcproject/entity/Follow.kt
index 1746477..993aa1d 100644
--- a/src/main/kotlin/fr/dcproject/entity/Follow.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Follow.kt
@@ -1,5 +1,5 @@
 package fr.dcproject.entity
-import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.mutable.UuidEntity
 import java.util.*
 
 class Follow <T : UuidEntity> (
diff --git a/src/main/kotlin/fr/dcproject/entity/User.kt b/src/main/kotlin/fr/dcproject/entity/User.kt
index b55d97d..7727b3f 100644
--- a/src/main/kotlin/fr/dcproject/entity/User.kt
+++ b/src/main/kotlin/fr/dcproject/entity/User.kt
@@ -1,6 +1,6 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.mutable.*
 import io.ktor.auth.Principal
 import org.joda.time.DateTime
 import java.util.*
diff --git a/src/main/kotlin/fr/dcproject/entity/Vote.kt b/src/main/kotlin/fr/dcproject/entity/Vote.kt
index b6aaca3..ee5e245 100644
--- a/src/main/kotlin/fr/dcproject/entity/Vote.kt
+++ b/src/main/kotlin/fr/dcproject/entity/Vote.kt
@@ -1,8 +1,8 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.EntityUpdatedAt
-import fr.postgresjson.entity.EntityUpdatedAtImp
-import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.mutable.EntityUpdatedAt
+import fr.postgresjson.entity.mutable.EntityUpdatedAtImp
+import fr.postgresjson.entity.mutable.UuidEntity
 import java.util.*
 
 open class Vote <T : UuidEntity> (
diff --git a/src/main/kotlin/fr/dcproject/entity/VoteAggregation.kt b/src/main/kotlin/fr/dcproject/entity/VoteAggregation.kt
index c19bdcb..f30bb43 100644
--- a/src/main/kotlin/fr/dcproject/entity/VoteAggregation.kt
+++ b/src/main/kotlin/fr/dcproject/entity/VoteAggregation.kt
@@ -1,8 +1,8 @@
 package fr.dcproject.entity
 
 import fr.postgresjson.entity.EntityI
-import fr.postgresjson.entity.EntityUpdatedAt
-import fr.postgresjson.entity.EntityUpdatedAtImp
+import fr.postgresjson.entity.mutable.EntityUpdatedAt
+import fr.postgresjson.entity.mutable.EntityUpdatedAtImp
 
 open class VoteAggregation(
     val up: Int,
diff --git a/src/main/kotlin/fr/dcproject/repository/Comment.kt b/src/main/kotlin/fr/dcproject/repository/Comment.kt
index 0149f27..60650aa 100644
--- a/src/main/kotlin/fr/dcproject/repository/Comment.kt
+++ b/src/main/kotlin/fr/dcproject/repository/Comment.kt
@@ -2,7 +2,7 @@ package fr.dcproject.repository
 
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.mutable.UuidEntity
 import fr.postgresjson.repository.RepositoryI
 import java.util.*
 import fr.dcproject.entity.Article as ArticleEntity
diff --git a/src/main/kotlin/fr/dcproject/repository/Follow.kt b/src/main/kotlin/fr/dcproject/repository/Follow.kt
index e260153..8badf33 100644
--- a/src/main/kotlin/fr/dcproject/repository/Follow.kt
+++ b/src/main/kotlin/fr/dcproject/repository/Follow.kt
@@ -2,7 +2,7 @@ package fr.dcproject.repository
 
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.mutable.UuidEntity
 import fr.postgresjson.repository.RepositoryI
 import java.util.*
 import fr.dcproject.entity.Article as ArticleEntity
diff --git a/src/main/kotlin/fr/dcproject/repository/Vote.kt b/src/main/kotlin/fr/dcproject/repository/Vote.kt
index 4300d3d..bf67523 100644
--- a/src/main/kotlin/fr/dcproject/repository/Vote.kt
+++ b/src/main/kotlin/fr/dcproject/repository/Vote.kt
@@ -7,7 +7,7 @@ import fr.dcproject.entity.Constitution
 import fr.dcproject.entity.VoteAggregation
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
-import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.mutable.UuidEntity
 import fr.postgresjson.repository.RepositoryI
 import java.util.*
 import fr.dcproject.entity.Citizen as CitizenEntity