diff --git a/EDMI_ClientSuite/State/LicenseState.vb b/EDMI_ClientSuite/State/LicenseState.vb
index 0e830809..f96b306d 100644
--- a/EDMI_ClientSuite/State/LicenseState.vb
+++ b/EDMI_ClientSuite/State/LicenseState.vb
@@ -1,7 +1,25 @@
 Public Class LicenseState
-    Public Modules As List(Of ModuleState)
-
-    Public Sub New()
-        Modules = New List(Of ModuleState)
-    End Sub
+    Public Modules As List(Of LicenseModule)
 End Class
+
+Public Class LicenseModule
+    Public Name As String
+    Public ValidUntil As Date
+    Public Users As List(Of LicenseUser)
+End Class
+
+Public Class LicenseUser
+    Public Type As UserType
+    Public Count As Integer
+    Public Test As Boolean
+    Public ValidUntil As Date
+End Class
+
+Public Enum UserType
+    PowerUser
+    [ReadOnly]
+    [WriteOnly]
+    ReadWrite
+End Enum
+
+
diff --git a/EDMI_ClientSuite/State/ModuleState.vb b/EDMI_ClientSuite/State/ModuleState.vb
deleted file mode 100644
index b7d16406..00000000
--- a/EDMI_ClientSuite/State/ModuleState.vb
+++ /dev/null
@@ -1,7 +0,0 @@
-Public Class ModuleState
-    Public Name As String
-
-    Public Sub New(Name As String)
-        Me.Name = Name
-    End Sub
-End Class