diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py
index b5747e054a8f44802b123fd5db101e6248f0b2cd..9093ebcc080f507d485d3db745fa32eb103f2613 100644
--- a/src/linkahead/common/models.py
+++ b/src/linkahead/common/models.py
@@ -200,15 +200,6 @@ class Entity:
 
         return self._wrapped_entity.version
 
-    @property   # getter for _cuid
-    def cuid(self):
-        # Set if None?
-        return self._cuid
-
-    @property   # getter for _flags
-    def flags(self):
-        return self._flags.copy()   # for dict[str, str] shallow copy is enough
-
     @version.setter
     def version(self, version: Optional[Version]):
         self._version = version
@@ -358,6 +349,15 @@ class Entity:
     def pickup(self, new_pickup):
         self.__pickup = new_pickup
 
+    @property   # getter for _cuid
+    def cuid(self):
+        # Set if None?
+        return self._cuid
+
+    @property   # getter for _flags
+    def flags(self):
+        return self._flags.copy()   # for dict[str, str] shallow copy is enough
+
     def grant(
         self,
         realm: Optional[str] = None,