diff --git a/lib/commands/command.ts b/lib/commands/command.ts
index 7f88a38..4748d40 100644
--- a/lib/commands/command.ts
+++ b/lib/commands/command.ts
@@ -134,17 +134,25 @@ export type CommandState = {
 	[key: string]: any
 }
 
+/**
+ * The common schema
+ */
+export type Schema = {
+	displayAttribute: string
+	identityAttribute: string
+	attributes: SchemaAttribute[]
+}
+
 /**
  * Account schema
  */
-export type AccountSchema = { groupAttribute: string } & EntitlementSchema
+export type AccountSchema = Schema & {
+	groupAttribute: string
+}
 
 /**
  * Entitlement schema
  */
-export type EntitlementSchema = {
+export type EntitlementSchema = Schema & {
 	type: string
-	displayAttribute: string
-	identityAttribute: string
-	attributes: SchemaAttribute[]
 }