diff --git a/passkey/db/__init__.py b/passkey/db/__init__.py
index 1301e67..0aca94e 100644
--- a/passkey/db/__init__.py
+++ b/passkey/db/__init__.py
@@ -12,8 +12,8 @@ from uuid import UUID
 
 
 @dataclass
-class Org:
-    uuid: UUID
+class Permission:
+    id: str  # String primary key (max 128 chars)
     display_name: str
 
 
@@ -22,6 +22,15 @@ class Role:
     uuid: UUID
     org_uuid: UUID
     display_name: str
+    permissions: list[Permission]
+
+
+@dataclass
+class Org:
+    uuid: UUID
+    display_name: str
+    permissions: list[Permission]  # All that the Org can grant
+    roles: list[Role]
 
 
 @dataclass
@@ -56,12 +65,6 @@ class Session:
     credential_uuid: UUID | None = None
 
 
-@dataclass
-class Permission:
-    id: str  # String primary key (max 128 chars)
-    display_name: str
-
-
 @dataclass
 class SessionContext:
     session: Session