diff --git a/src/main/jdl/customer.jdl b/src/main/jdl/customer.jdl
index 9e023aeb..707076ea 100644
--- a/src/main/jdl/customer.jdl
+++ b/src/main/jdl/customer.jdl
@@ -1,24 +1,19 @@
+filter all
+dto all with mapstruct
+service all with serviceClass
+paginate all with  infinite-scroll
 
 entity Customer {
     number Integer required unique min(10000) max(99999),
     prefix String required unique pattern(/[a-z][a-z0-9]+/),
 }
 
-filter Customer
-paginate Customer with infinite-scroll
-service Customer with serviceClass
-dto Customer with mapstruct
-
 entity Contact {
     firstName String required maxlength(80),
     lastName String required maxlength(80),
     email String required maxlength(80)
 }
 
-filter Contact
-paginate Contact with infinite-scroll
-service Contact with serviceClass
-dto Contact with mapstruct
 
 enum CustomerContactRole {
     CONTRACTUAL,
@@ -30,17 +25,11 @@ entity CustomerContact {
     role CustomerContactRole required
 }
 
-service CustomerContact with serviceClass
-dto CustomerContact with mapstruct
-
 entity Membership {
     sinceDate LocalDate required,
     untilDate LocalDate
 }
 
-service Membership with serviceClass
-dto Membership with mapstruct
-
 enum ShareAction {
     SUBSCRIPTION,
     CANCELLATION