diff --git a/.classpath b/.classpath
index 29cf6e1..cd5c385 100644
--- a/.classpath
+++ b/.classpath
@@ -37,8 +37,8 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/classes" path="target/generated-sources/jaxb">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/.project b/.project
index 6330f26..e729774 100644
--- a/.project
+++ b/.project
@@ -15,11 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
 			<arguments>
@@ -35,6 +30,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..6f1cba6
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/src/main/resources/message_schema.xsd b/src/main/resources/message_schema.xsd
index a6afc24..aebbd1a 100644
--- a/src/main/resources/message_schema.xsd
+++ b/src/main/resources/message_schema.xsd
@@ -1,34 +1,32 @@
 <?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<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="Message" type="Message"/>
-
-	<xs:complexType name="Message">
-		<xs:sequence>
-			<xs:element name="MetaData" type="MetaData" />
-			<xs:element name="Content" type="Content"
-				maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
-	<xs:complexType name="Content">
-		<xs:sequence>
-			<xs:any />
-		</xs:sequence>
-		<xs:attribute name="type" type="xs:string" />
-	</xs:complexType>
-
-	<!-- Sender ID to be able to reply (maybe not necessary because we already 
-		have Sender ID -->
-
-	<xs:complexType name="MetaData">
-		<xs:sequence>
-			<xs:element name="Sender" type="xs:string" />
-			<xs:element name="Recipient" type="xs:string" />
-			<xs:element name="Time" type="xs:time" />
-			<xs:element name="Date" type="xs:date" />
-			<xs:element name="State" type="xs:boolean" />
-		</xs:sequence>
-	</xs:complexType>
+	<xs:element name="Message">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="MetaData">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="Sender" type="xs:string" />
+							<xs:element name="Recipient" type="xs:string" />
+							<xs:element name="Date" type="xs:date" />
+							<xs:element name="State" type="xs:boolean" />
+						</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:element>
 
 </xs:schema> 
\ No newline at end of file