diff --git a/models/User.ts b/models/User.ts
index a2f3e167aaf26d8d83f5cac8406000f4b8bc6a31..0be9e528efd0d72fa7ad44838da39d96567c4a33 100644
--- a/models/User.ts
+++ b/models/User.ts
@@ -1,12 +1,22 @@
+import UserRole      from './UserRole';
+import Exercise      from './Exercise';
+import Assignment    from './Assignment';
+import GitlabProfile from '../../shared/types/Gitlab/GitlabProfile';
+
+
 interface User {
     id: number;
-    firstName: string;
-    lastName: string;
+    name: string;
     mail: string;
-    gitlabId: number;
-    role: string;
+    role: UserRole;
+    gitlabUsername: string;
+    gitlabLastInfo: GitlabProfile;
     isTeachingStaff: boolean;
+    isAdmin: boolean;
     deleted: boolean;
+
+    assignments?: Array<Assignment>;
+    exercises?: Array<Exercise>;
 }