diff --git a/db/schema.cds b/db/schema.cds
index 93f3b5c8..5fe99020 100644
--- a/db/schema.cds
+++ b/db/schema.cds
@@ -6,10 +6,7 @@ namespace sap.capire.incidents;
  * Customers using products sold by our company.
  * Customers can create support Incidents.
  */
-entity Customers : cuid, managed {
-  firstName     : String;
-  lastName      : String;
-  email         : EMailAddress;
+entity Customers : Users, managed {
   phone         : PhoneNumber;
   creditCardNo  : String(16) @assert.format: '^[1-9]\d{15}$';
   addresses     : Composition of many Addresses on addresses.customer = $self;
@@ -22,6 +19,11 @@ entity Addresses : cuid, managed {
   streetAddress : String;
 }
 
+/**
+ * Supporters are users given the 'support' role.
+ */
+entity Supporters : Users, managed {}
+
 
 /**
  * Incidents created by Customers.
@@ -61,5 +63,11 @@ entity Conversations : cuid, managed {
   message   : String;
 }
 
+aspect Users {
+  key email     : EMailAddress;
+  firstName     : String;
+  lastName      : String;
+}
+
 type EMailAddress : String;
 type PhoneNumber  : String;