diff --git a/reviews/db/schema.cds b/reviews/db/schema.cds
index 0183a8fd..e49f90ca 100644
--- a/reviews/db/schema.cds
+++ b/reviews/db/schema.cds
@@ -29,3 +29,10 @@ entity Likes {
   key review : Association to Reviews;
   key user   : User;
 }
+
+// Auto-fill reviewers and review dates
+annotate Reviews with {
+  reviewer @cds.on.insert:$user;
+  date     @cds.on.insert:$now;
+  date     @cds.on.update:$now;
+}
diff --git a/reviews/srv/reviews-service.cds b/reviews/srv/reviews-service.cds
index dafcb0d1..edd24e0d 100644
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -16,13 +16,6 @@ service ReviewsService {
     rating   @mandatory @assert.enum;
   }
 
-  // Auto-fill reviewers and review dates
-  annotate Reviews with {
-    reviewer @cds.on.insert:$user;
-    date     @cds.on.insert:$now;
-    date     @cds.on.update:$now;
-  }
-
 }