diff --git a/src/lib/schema.ts b/src/lib/schema.ts
index 33592f8..cd28ab3 100644
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@ -1,3 +1,5 @@
+// Application Data
+
 export interface Graphic {
   name: string;
   file: string;
@@ -13,6 +15,8 @@ export interface User {
   admin: boolean;
 }
 
+// Season Data
+
 export interface Team {
   id: string;
   name: string;
@@ -54,10 +58,18 @@ export interface Substitution {
   race: string;
 }
 
+// User Data
+
 export interface RacePick {
   id: string;
   user: string;
   race: string;
   pxx?: string;
   dnf?: string;
+  expand: {
+    dnf: Driver;
+    pxx: Driver;
+    race: Race;
+    user: User;
+  };
 }