diff --git a/UML/classdiagram.png b/UML/classdiagram.png
index ed1df16bcbaf738c320de83b41060a9e627e4974..96a9d722384f21c90438b83a5097190a18d2ed29 100644
Binary files a/UML/classdiagram.png and b/UML/classdiagram.png differ
diff --git a/UML/classdiagram.uxf b/UML/classdiagram.uxf
index 59e57160992a98e87e4aacdc5b3e53a27d4d5f6d..c5e15ecf119c6e90933ae8736ebb92579bd0440b 100644
--- a/UML/classdiagram.uxf
+++ b/UML/classdiagram.uxf
@@ -1,4 +1,4 @@
-<diagram program="umletino" version="15.1"><zoom_level>11</zoom_level><help_text>Space for diagram notes</help_text><element><id>UMLClass</id><coordinates><x>22</x><y>550</y><w>715</w><h>319</h></coordinates><panel_attributes>ActivitiesService
+<diagram program="umletino" version="15.1"><zoom_level>8</zoom_level><help_text>Space for diagram notes</help_text><element><id>UMLClass</id><coordinates><x>16</x><y>400</y><w>520</w><h>232</h></coordinates><panel_attributes>ActivitiesService
 --
 --
 + addNoteCreateActivity(userId: string, roomSession: RoomSession, note: Note): void
@@ -16,15 +16,15 @@
 + calculateVideoPoints(activities: Activity[]): int
 + calculateBrowserPoints(activities: Activity[]): int
 + calculateWhiteboardPoints(activities: Activity[]): int
-+ calculateNotePoints(activities: Activity[]): int</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1177</x><y>1089</y><w>495</w><h>88</h></coordinates><panel_attributes>RoleAssignmentService
++ calculateNotePoints(activities: Activity[]): int</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>856</x><y>792</y><w>360</w><h>64</h></coordinates><panel_attributes>RoleAssignmentService
 --
 --
 + determineRole(sessionId:number, userId: string): void
-+ assignRole(sessionId:number):Promise&lt;RoleAssignmentDto[]&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1397</x><y>1199</y><w>495</w><h>88</h></coordinates><panel_attributes>ModeAssignmentService
++ assignRole(sessionId:number):Promise&lt;RoleAssignmentDto[]&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1016</x><y>872</y><w>360</w><h>64</h></coordinates><panel_attributes>ModeAssignmentService
 --
 --
 + determineMode(sessionId:number): void
-+ assignMode(sessionId:number): Promise&lt;ModeAssignment[]&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>341</x><y>1595</y><w>198</w><h>187</h></coordinates><panel_attributes>Activity
++ assignMode(sessionId:number): Promise&lt;ModeAssignment[]&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>248</x><y>1160</y><w>144</w><h>136</h></coordinates><panel_attributes>Activity
 --
 + id: number
 + user: string
@@ -35,7 +35,7 @@
 + noteId: number
 + timestamp: Date
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>484</x><y>1914</y><w>253</w><h>154</h></coordinates><panel_attributes>RoomSession
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>352</x><y>1392</y><w>184</w><h>112</h></coordinates><panel_attributes>RoomSession
 --
 + id: number
 + room: Room
@@ -44,14 +44,14 @@
 + users: Collection &lt;RoomSessionUser&gt;
 + activities: Collection &lt;Activity&gt;
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>671</x><y>1617</y><w>209</w><h>121</h></coordinates><panel_attributes>RoomSessionUser
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>488</x><y>1176</y><w>152</w><h>88</h></coordinates><panel_attributes>RoomSessionUser
 --
 + id: number
 + roomSession: RoomSession
 + userId: string
 + name: string
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>0</x><y>506</y><w>1958</w><h>847</h></coordinates><panel_attributes>Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>286</x><y>1496</y><w>1342</w><h>946</h></coordinates><panel_attributes>Entities</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1034</x><y>1628</y><w>253</w><h>165</h></coordinates><panel_attributes>SessionPoints
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>0</x><y>368</y><w>1424</w><h>616</h></coordinates><panel_attributes>Services</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>208</x><y>1088</y><w>976</w><h>688</h></coordinates><panel_attributes>Entities</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>752</x><y>1184</y><w>184</w><h>120</h></coordinates><panel_attributes>SessionPoints
 --
 + id: number
 + roomSessionUser: RoomSessionUser
@@ -61,16 +61,16 @@
 + whiteboardPoints: number
 + notePoints: number
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>495</x><y>1771</y><w>110</w><h>165</h></coordinates><panel_attributes>lt=-
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>360</x><y>1288</y><w>80</w><h>120</h></coordinates><panel_attributes>lt=-
 m1=1
 m2=0...n
-references ^</panel_attributes><additional_attributes>10;130;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>693</x><y>1727</y><w>99</w><h>209</h></coordinates><panel_attributes>lt=-
+references ^</panel_attributes><additional_attributes>10;130;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>504</x><y>1256</y><w>72</w><h>152</h></coordinates><panel_attributes>lt=-
 m1=1
 m2=0...n
-contains ^</panel_attributes><additional_attributes>10;170;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>869</x><y>1650</y><w>187</w><h>55</h></coordinates><panel_attributes>lt=-
+contains ^</panel_attributes><additional_attributes>10;170;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>632</x><y>1200</y><w>136</w><h>40</h></coordinates><panel_attributes>lt=-
 m1=1
 m2=1
-has &gt;</panel_attributes><additional_attributes>10;20;150;20</additional_attributes></element><element><id>UMLClass</id><coordinates><x>473</x><y>2189</y><w>253</w><h>209</h></coordinates><panel_attributes>Room
+has &gt;</panel_attributes><additional_attributes>10;20;150;20</additional_attributes></element><element><id>UMLClass</id><coordinates><x>344</x><y>1592</y><w>184</w><h>152</h></coordinates><panel_attributes>Room
 --
 + id: number
 + name: string
@@ -82,44 +82,44 @@ has &gt;</panel_attributes><additional_attributes>10;20;150;20</additional_attri
 + notes = new Collection&lt;Note&gt;(this)
 + whiteboardCanvas
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>594</x><y>2057</y><w>66</w><h>154</h></coordinates><panel_attributes>lt=&lt;&lt;&lt;&lt;-
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>432</x><y>1496</y><w>48</w><h>112</h></coordinates><panel_attributes>lt=&lt;&lt;&lt;&lt;-
 m1=1
 m2=0...n
-has ^</panel_attributes><additional_attributes>10;120;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1320</x><y>1925</y><w>264</w><h>121</h></coordinates><panel_attributes>Roles
+has ^</panel_attributes><additional_attributes>10;120;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>960</x><y>1400</y><w>192</w><h>88</h></coordinates><panel_attributes>Roles
 --
 + id: number
 + roleName: string
 + userId: string
 + roomSession: RoomSession
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1342</x><y>2178</y><w>264</w><h>110</h></coordinates><panel_attributes>Modes
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>976</x><y>1584</y><w>192</w><h>80</h></coordinates><panel_attributes>Modes
 --
 + id: number
 + mode: string
 + roomSession: RoomSession
 --
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>825</x><y>1727</y><w>517</w><h>264</h></coordinates><panel_attributes>lt=-
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>600</x><y>1256</y><w>376</w><h>192</h></coordinates><panel_attributes>lt=-
 m1=1
 m2=1
-&lt; assigned </panel_attributes><additional_attributes>10;10;10;210;450;210</additional_attributes></element><element><id>Relation</id><coordinates><x>726</x><y>1980</y><w>638</w><h>286</h></coordinates><panel_attributes>lt=-
+&lt; assigned </panel_attributes><additional_attributes>10;10;10;210;450;210</additional_attributes></element><element><id>Relation</id><coordinates><x>528</x><y>1440</y><w>464</w><h>208</h></coordinates><panel_attributes>lt=-
 m1=1
 m2=1
-&lt; assigned </panel_attributes><additional_attributes>10;10;160;10;370;230;560;230</additional_attributes></element><element><id>UMLPackage</id><coordinates><x>924</x><y>0</y><w>1595</w><h>495</h></coordinates><panel_attributes>Controller</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1276</x><y>143</y><w>737</w><h>66</h></coordinates><panel_attributes>RoomSessionUserPointsController
+&lt; assigned </panel_attributes><additional_attributes>10;10;160;10;370;230;560;230</additional_attributes></element><element><id>UMLPackage</id><coordinates><x>672</x><y>0</y><w>1160</w><h>360</h></coordinates><panel_attributes>Controller</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>928</x><y>104</y><w>536</w><h>48</h></coordinates><panel_attributes>RoomSessionUserPointsController
 --
 --
-+ getPointsByRoomSessionUser(@Param('userId') userId: number): Promise&lt;RoomSessionUserPointsResponseDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>968</x><y>55</y><w>737</w><h>77</h></coordinates><panel_attributes>RoomSessionPointsController
++ getPointsByRoomSessionUser(@Param('userId') userId: number): Promise&lt;RoomSessionUserPointsResponseDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>704</x><y>40</y><w>536</w><h>56</h></coordinates><panel_attributes>RoomSessionPointsController
 --
 --
-+ getPointsBySession(@Param('sessionId') sessionId: number): Promise&lt;RoomSessionPointsRequestDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1518</x><y>242</y><w>737</w><h>88</h></coordinates><panel_attributes>RoleAssignmentController
++ getPointsBySession(@Param('sessionId') sessionId: number): Promise&lt;RoomSessionPointsRequestDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1104</x><y>176</y><w>536</w><h>64</h></coordinates><panel_attributes>RoleAssignmentController
 --
 --
 + getRolesBySession(sessionId:number):Promise&lt;RolesAssignmentDto[]&gt;
 + getUserRoleForSession(userId: string, sessionId)
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1738</x><y>363</y><w>737</w><h>77</h></coordinates><panel_attributes>ModeAssignmentController
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1264</x><y>264</y><w>536</w><h>56</h></coordinates><panel_attributes>ModeAssignmentController
 --
 --
 + getModeForSession(sessionId:number): Promise&lt;ModeAssignment[]&gt;
-</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>2123</x><y>968</y><w>286</w><h>110</h></coordinates><panel_attributes>RoomSessionUserPointsResponseDto
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1544</x><y>704</y><w>208</w><h>80</h></coordinates><panel_attributes>RoomSessionUserPointsResponseDto
 --
 + allPoints: AllPoints
 + totalPoints: number
@@ -127,14 +127,14 @@ m2=1
 + userId: number
 --
 
-group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>2123</x><y>847</y><w>253</w><h>99</h></coordinates><panel_attributes>RoomSessionPointsRequestDto
+group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1544</x><y>616</y><w>184</w><h>72</h></coordinates><panel_attributes>RoomSessionPointsRequestDto
 --
 + allPoints: AllPoints
 + totalPoints: number;
 + sessionId: number;
 --
 
-group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>2123</x><y>1100</y><w>253</w><h>121</h></coordinates><panel_attributes>RoleAssignmentDto
+group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1544</x><y>800</y><w>184</w><h>88</h></coordinates><panel_attributes>RoleAssignmentDto
 --
 + userId: string
 + userName: string
@@ -142,64 +142,68 @@ group=group-4</panel_attributes><additional_attributes></additional_attributes><
 + pointsTotal: number
 --
 
-group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>2123</x><y>1243</y><w>253</w><h>77</h></coordinates><panel_attributes>ModeAssignmentDto
+group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1544</x><y>904</y><w>184</w><h>56</h></coordinates><panel_attributes>ModeAssignmentDto
 --
 + sessionId: number
 + mode: string
 --
 
-group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>2079</x><y>792</y><w>363</w><h>561</h></coordinates><panel_attributes>DTOs
-group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>2079</x><y>572</y><w>187</w><h>143</h></coordinates><panel_attributes>&lt;&lt;dateType&gt;&gt;
+group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLPackage</id><coordinates><x>1512</x><y>576</y><w>264</w><h>408</h></coordinates><panel_attributes>DTOs
+group=group-4</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1512</x><y>416</y><w>136</w><h>104</h></coordinates><panel_attributes>&lt;&lt;dateType&gt;&gt;
 AllPoints
 --
 audioPoints: number
 videoPoints: number
 browserPoints: number
 whiteboardPoints: number
-notePoints: number</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>451</x><y>891</y><w>561</w><h>88</h></coordinates><panel_attributes>RoomSessionService
+notePoints: number</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>328</x><y>648</y><w>408</w><h>64</h></coordinates><panel_attributes>RoomSessionService
 --
 --
 + beginSession(room: Room): Promise&lt;RoomSession&gt;
 + closeSession(roomSession: RoomSession): Promise&lt;void&gt;
-+ getAllPointsBySession(sessionId: number): Promise&lt;RoomSessionPointsRequestDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>781</x><y>990</y><w>682</w><h>88</h></coordinates><panel_attributes>RoomSessionUserService
++ getAllPointsBySession(sessionId: number): Promise&lt;RoomSessionPointsRequestDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>568</x><y>720</y><w>496</w><h>64</h></coordinates><panel_attributes>RoomSessionUserService
 --
 --
 + addSessionUser(roomSession: RoomSession, userId: string, name: string): Promise&lt;RoomSessionUser&gt;
 + updateSessionUserName(roomSession: RoomSession, userId: string, name:string)
-+ getPointsByRoomSessionUser(userId: number): Promise&lt;RoomSessionUserPointsResponseDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1001</x><y>913</y><w>1144</w><h>55</h></coordinates><panel_attributes>lt=&lt;.
++ getPointsByRoomSessionUser(userId: number): Promise&lt;RoomSessionUserPointsResponseDto&gt;</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>728</x><y>664</y><w>832</w><h>40</h></coordinates><panel_attributes>lt=&lt;.
 
-returns</panel_attributes><additional_attributes>1020;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1452</x><y>1012</y><w>693</w><h>55</h></coordinates><panel_attributes>lt=&lt;.
+returns</panel_attributes><additional_attributes>1020;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1056</x><y>736</y><w>504</w><h>40</h></coordinates><panel_attributes>lt=&lt;.
 
-returns</panel_attributes><additional_attributes>610;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1661</x><y>1133</y><w>484</w><h>55</h></coordinates><panel_attributes>lt=&lt;.
+returns</panel_attributes><additional_attributes>610;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1208</x><y>824</y><w>352</w><h>40</h></coordinates><panel_attributes>lt=&lt;.
 
-returns</panel_attributes><additional_attributes>420;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1881</x><y>1243</y><w>264</w><h>55</h></coordinates><panel_attributes>lt=&lt;.
+returns</panel_attributes><additional_attributes>420;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>1368</x><y>904</y><w>192</w><h>40</h></coordinates><panel_attributes>lt=&lt;.
 
-returns</panel_attributes><additional_attributes>220;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>968</x><y>121</y><w>55</w><h>792</h></coordinates><panel_attributes>lt=&lt;.
+returns</panel_attributes><additional_attributes>220;20;10;20</additional_attributes></element><element><id>Relation</id><coordinates><x>704</x><y>88</y><w>40</w><h>576</h></coordinates><panel_attributes>lt=&lt;.
 
-uses</panel_attributes><additional_attributes>10;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1606</x><y>319</y><w>66</w><h>792</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>10;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1168</x><y>232</y><w>48</w><h>576</h></coordinates><panel_attributes>lt=&lt;.
 
-uses</panel_attributes><additional_attributes>20;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>594</x><y>957</y><w>110</w><h>979</h></coordinates><panel_attributes>lt=&lt;.
-manages v</panel_attributes><additional_attributes>10;870;20;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1364</x><y>198</y><w>66</w><h>814</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>20;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>432</x><y>696</y><w>80</w><h>712</h></coordinates><panel_attributes>lt=&lt;.
+manages v</panel_attributes><additional_attributes>10;870;20;10</additional_attributes></element><element><id>Relation</id><coordinates><x>992</x><y>144</y><w>48</w><h>592</h></coordinates><panel_attributes>lt=&lt;.
 
-uses</panel_attributes><additional_attributes>20;720;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1848</x><y>429</y><w>66</w><h>792</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>20;720;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1344</x><y>312</y><w>48</w><h>576</h></coordinates><panel_attributes>lt=&lt;.
 
-uses</panel_attributes><additional_attributes>20;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>836</x><y>1067</y><w>99</w><h>572</h></coordinates><panel_attributes>lt=&lt;.
-manages</panel_attributes><additional_attributes>10;500;20;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1342</x><y>1166</y><w>88</w><h>781</h></coordinates><panel_attributes>lt=&lt;.
-manages</panel_attributes><additional_attributes>10;690;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1595</x><y>1276</y><w>187</w><h>979</h></coordinates><panel_attributes>lt=&lt;.
-manages</panel_attributes><additional_attributes>10;870;100;870;100;10</additional_attributes></element><element><id>Relation</id><coordinates><x>374</x><y>858</y><w>110</w><h>759</h></coordinates><panel_attributes>lt=&lt;.
-manages v</panel_attributes><additional_attributes>10;670;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>242</x><y>858</y><w>946</w><h>1639</h></coordinates><panel_attributes>lt=&lt;.
-manages &gt;</panel_attributes><additional_attributes>840;850;840;1470;10;1470;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1144</x><y>1067</y><w>77</w><h>583</h></coordinates><panel_attributes>lt=&lt;.
-queries</panel_attributes><additional_attributes>10;510;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>737</x><y>968</y><w>77</w><h>88</h></coordinates><panel_attributes>lt=&lt;.
-uses</panel_attributes><additional_attributes>10;10;40;60</additional_attributes></element><element><id>Relation</id><coordinates><x>1232</x><y>1166</y><w>55</w><h>484</h></coordinates><panel_attributes>lt=&lt;.
-uses</panel_attributes><additional_attributes>10;420;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1276</x><y>1276</y><w>308</w><h>462</h></coordinates><panel_attributes>lt=&lt;.
-uses</panel_attributes><additional_attributes>10;400;240;400;240;10</additional_attributes></element><element><id>Relation</id><coordinates><x>275</x><y>858</y><w>506</w><h>781</h></coordinates><panel_attributes>lt=&lt;.
-uses</panel_attributes><additional_attributes>440;690;440;280;10;280;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1826</x><y>1914</y><w>110</w><h>143</h></coordinates><panel_attributes>&lt;&lt;enumeration&gt;&gt;
+uses</panel_attributes><additional_attributes>20;700;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>608</x><y>776</y><w>72</w><h>416</h></coordinates><panel_attributes>lt=&lt;.
+manages</panel_attributes><additional_attributes>10;500;20;10</additional_attributes></element><element><id>Relation</id><coordinates><x>976</x><y>848</y><w>64</w><h>568</h></coordinates><panel_attributes>lt=&lt;.
+manages</panel_attributes><additional_attributes>10;690;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>1160</x><y>928</y><w>136</w><h>712</h></coordinates><panel_attributes>lt=&lt;.
+manages</panel_attributes><additional_attributes>10;870;100;870;100;10</additional_attributes></element><element><id>Relation</id><coordinates><x>272</x><y>624</y><w>80</w><h>552</h></coordinates><panel_attributes>lt=&lt;.
+manages v</panel_attributes><additional_attributes>10;670;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>176</x><y>624</y><w>688</w><h>1192</h></coordinates><panel_attributes>lt=&lt;.
+manages &gt;</panel_attributes><additional_attributes>840;850;840;1470;10;1470;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>832</x><y>776</y><w>56</w><h>424</h></coordinates><panel_attributes>lt=&lt;.
+queries</panel_attributes><additional_attributes>10;510;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>536</x><y>704</y><w>56</w><h>64</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>10;10;40;60</additional_attributes></element><element><id>Relation</id><coordinates><x>896</x><y>848</y><w>40</w><h>352</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>10;420;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>928</x><y>928</y><w>224</w><h>336</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>10;400;240;400;240;10</additional_attributes></element><element><id>Relation</id><coordinates><x>200</x><y>624</y><w>368</w><h>568</h></coordinates><panel_attributes>lt=&lt;.
+uses</panel_attributes><additional_attributes>440;690;440;280;10;280;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>1296</x><y>1384</y><w>104</w><h>136</h></coordinates><panel_attributes>&lt;&lt;enumeration&gt;&gt;
 RoleType
 --
-MODERATOR
-NOTETAKER
-PASSIVE
-...</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1782</x><y>2178</y><w>209</w><h>110</h></coordinates><panel_attributes>&lt;&lt;enumeration&gt;&gt;
+COORDINATOR
+DOCUMENTER
+CODER_DEBUGGER
+VISUALIZER
+ACTIVE_PARTICIPANT
+OBSERVER
+LURKER
+DISRUPTOR</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1288</x><y>1584</y><w>152</w><h>80</h></coordinates><panel_attributes>&lt;&lt;enumeration&gt;&gt;
 ModeType
 --
 PAIR_PROGRAMMING
diff --git a/backend b/backend
index c4cc004f4736e830eafcd62b3dd755818195ab14..ba1ed463053c9238b2efe963727b16cfc06eeb64 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit c4cc004f4736e830eafcd62b3dd755818195ab14
+Subproject commit ba1ed463053c9238b2efe963727b16cfc06eeb64
diff --git a/frontend b/frontend
index 547523ecfcd488dcd690d9c740e93c968aca9fc0..486b810ce174c29af0cf184ed937a4dd33612119 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 547523ecfcd488dcd690d9c740e93c968aca9fc0
+Subproject commit 486b810ce174c29af0cf184ed937a4dd33612119