diff --git a/.classpath b/.classpath
index 4482efd..d2c0172 100644
--- a/.classpath
+++ b/.classpath
@@ -13,12 +13,6 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/src/main/java/envoy/schema/UserStatus.java b/src/main/java/envoy/schema/UserStatus.java
new file mode 100644
index 0000000..f87d576
--- /dev/null
+++ b/src/main/java/envoy/schema/UserStatus.java
@@ -0,0 +1,22 @@
+package envoy.schema;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Project: <strong>envoy-common</strong><br>
+ * File: <strong>UserStatus.java</strong><br>
+ * Created: <strong>27 Oct 2019</strong><br>
+ * 
+ * @author Maximilian K&auml;fer
+ */
+@XmlType(name = "")
+@XmlEnum
+public enum UserStatus {
+
+	Online, DoNotDisturb, AFK, Offline;
+
+	public String value() { return name(); }
+
+	public static UserStatus fromValue(String v) { return valueOf(v); }
+}
diff --git a/src/main/resources/message_schema.xsd b/src/main/resources/sync_schema.xsd
similarity index 55%
rename from src/main/resources/message_schema.xsd
rename to src/main/resources/sync_schema.xsd
index 0b27158..7b20b87 100644
--- a/src/main/resources/message_schema.xsd
+++ b/src/main/resources/sync_schema.xsd
@@ -1,48 +1,70 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="https://github.com/informatik-ag-ngl"
-	xmlns="https://github.com/informatik-ag-ngl"
-	elementFormDefault="qualified">
-
-	<xs:element name="Messages">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Message" type="Message" minOccurs="0"
-					maxOccurs="unbounded" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:complexType name="Message">
-		<xs:sequence>
-			<xs:element name="MetaData">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Sender" type="xs:long" />
-						<xs:element name="Recipient" type="xs:long" />
-						<xs:element name="Date" type="xs:dateTime" />
-						<xs:element name="State">
-							<xs:simpleType>
-								<xs:restriction base="xs:string">
-									<xs:enumeration value="Waiting"/>
-									<xs:enumeration value="Sent"/>
-									<xs:enumeration value="Received"/>
-									<xs:enumeration value="Read"/>
-								</xs:restriction>
-							</xs:simpleType>
-						</xs:element>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Content" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="text" type="xs:string" />
-					</xs:sequence>
-					<xs:attribute name="type" type="xs:string" />
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema> 
\ No newline at end of file
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://github.com/informatik-ag-ngl"
+	xmlns="https://github.com/informatik-ag-ngl"
+	elementFormDefault="qualified">
+
+	<xs:element name="Sync">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Message" type="Message" minOccurs="0"
+					maxOccurs="unbounded" />
+				<xs:element name="User" type="User" minOccurs="0"
+					maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+
+	<xs:complexType name="Message">
+		<xs:sequence>
+			<xs:element name="Metadata">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="Sender" type="xs:long" />
+						<xs:element name="Recipient" type="xs:long" />
+						<xs:element name="Date" type="xs:dateTime" />
+						<xs:element name="MessageId" type="xs:long" />
+						<xs:element name="State">
+							<xs:simpleType>
+								<xs:restriction base="xs:string">
+									<xs:enumeration value="Waiting" />
+									<xs:enumeration value="Sent" />
+									<xs:enumeration value="Received" />
+									<xs:enumeration value="Read" />
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:element>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Content" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="text" type="xs:string" />
+					</xs:sequence>
+					<xs:attribute name="type" type="xs:string" />
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
+
+	<xs:complexType name="User">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string" />
+			<xs:element name="ID" type="xs:long" />
+			<xs:element name="Status">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="Online" />
+						<xs:enumeration value="DoNotDisturb" />
+						<xs:enumeration value="AFK" />
+						<xs:enumeration value="Offline" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/user_schema.xsd b/src/main/resources/user_schema.xsd
deleted file mode 100644
index 93c18f9..0000000
--- a/src/main/resources/user_schema.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="https://github.com/informatik-ag-ngl"
-	xmlns="https://github.com/informatik-ag-ngl"
-	elementFormDefault="qualified">
-
-	<xs:element name="Users">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="User" type="User" minOccurs="0"
-					maxOccurs="unbounded" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-
-	<xs:complexType name="User">
-		<xs:sequence>
-			<xs:element name="Name" type="xs:string" />
-			<xs:element name="ID" type="xs:long" />
-		</xs:sequence>
-	</xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/src/main/xjb/bindings.xml b/src/main/xjb/bindings.xml
index 66ef12c..4dc2c23 100644
--- a/src/main/xjb/bindings.xml
+++ b/src/main/xjb/bindings.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
 <jaxb:bindings xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
 	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
@@ -6,10 +8,26 @@
 		fixedAttributeAsConstantProperty="true">
 		<xjc:serializable />
 	</jaxb:globalBindings>
-	<jaxb:bindings schemaLocation="../resources/message_schema.xsd">
+	<jaxb:bindings
+		schemaLocation="../resources/sync_schema.xsd">
+		
+		<jaxb:bindings node="//xs:element[@name='Message']">
+			<jaxb:property name="Messages"/>
+		</jaxb:bindings>
+		
+		<jaxb:bindings node="//xs:element[@name='User']">
+			<jaxb:property name="Users"/>
+		</jaxb:bindings>
+		
 		<jaxb:bindings
 			node="//xs:element[@name='State']/xs:simpleType">
 			<jaxb:typesafeEnumClass name="MessageState" />
 		</jaxb:bindings>
+
+		<jaxb:bindings
+			node="//xs:element[@name='Status']/xs:simpleType">
+			<jaxb:typesafeEnumClass name="UserStatus" />
+		</jaxb:bindings>
+		
 	</jaxb:bindings>
 </jaxb:bindings>
\ No newline at end of file