diff --git a/resources/Schema/Components/Test.xml b/resources/Schema/Components/Test.xml
deleted file mode 100644
index 9e49d37a..00000000
--- a/resources/Schema/Components/Test.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<c:Test>
-	<Integer>1</Integer>
-	<Float>1.333</Float>
-	<Vector X="1.33333" Y="2.33333" Z="3.33333"/>
-	<Quaternion X="1.33333" Y="2.33333" Z="3.33333" W="4.44444"/>
-</c:Test>
\ No newline at end of file
diff --git a/resources/Schema/Components/Test.xsd b/resources/Schema/Components/Test.xsd
deleted file mode 100644
index e31f83af..00000000
--- a/resources/Schema/Components/Test.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="types">
-	<xs:import schemaLocation="../Types.xsd" namespace="types"/>
-
-	<xs:element name="Test">
-		<xs:annotation>
-			<xs:documentation>ECS Test Component</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="Integer" type="t:int" minOccurs="0"/>
-				<xs:element name="Double" type="t:double" minOccurs="0"/>
-				<xs:element name="String" type="t:string" minOccurs="0"/>
-				<xs:element name="Vector" type="t:Vector" minOccurs="0"/>
-				<xs:element name="Quaternion" type="t:Quaternion" minOccurs="0"/>
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/src/Engine/Core/EntityXMLFile.cpp b/src/Engine/Core/EntityXMLFile.cpp
index b96e366e..bf8daceb 100644
--- a/src/Engine/Core/EntityXMLFile.cpp
+++ b/src/Engine/Core/EntityXMLFile.cpp
@@ -415,6 +415,7 @@ std::size_t EntityXMLFile::getTypeStride(std::string typeName)
     std::map<std::string, size_t> typeStrides{
         { "bool", sizeof(bool) },
         { "int", sizeof(int) },
+        { "float", sizeof(float) },
         { "double", sizeof(double) },
         { "string", sizeof(std::string) },
         { "Vector", sizeof(glm::vec3) },
@@ -443,39 +444,52 @@ void EntityXMLFile::writeData(const xercesc::DOMElement* element, std::string ty
 {
     using namespace xercesc;
 
-    XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str()));
-    if (dataType == XSValue::DataType::dt_MAXCOUNT) {
-        if (typeName == "Vector") {
-            glm::vec3 vec;
-            vec.x = getFloatAttribute(element, "X");
-            vec.y = getFloatAttribute(element, "Y");
-            vec.z = getFloatAttribute(element, "Z");
-            memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
-        } else if (typeName == "Color") {
-            glm::vec4 vec;
-            vec.r = getFloatAttribute(element, "R");
-            vec.g = getFloatAttribute(element, "G");
-            vec.b = getFloatAttribute(element, "B");
-            vec.a = getFloatAttribute(element, "A");
-            memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
-        } else if (typeName == "Quaternion") {
-            glm::quat q;
-            q.x = getFloatAttribute(element, "X");
-            q.y = getFloatAttribute(element, "Y");
-            q.z = getFloatAttribute(element, "Z");
-            q.w = getFloatAttribute(element, "W");
-            memcpy(outData, reinterpret_cast<char*>(&q), getTypeStride(typeName));
-        }
-    } else if (dataType == XSValue::DataType::dt_string) {
-        char* str = XMLString::transcode(element->getTextContent());
-        std::string standardString(str);
-        new (outData) std::string(str);
-        XMLString::release(&str);
-        //memcpy(outData, reinterpret_cast<char*>(&standardString), getTypeStride(typeName));
-    } else {
+    if (typeName == "Vector") {
+        glm::vec3 vec;
+        vec.x = getFloatAttribute(element, "X");
+        vec.y = getFloatAttribute(element, "Y");
+        vec.z = getFloatAttribute(element, "Z");
+        memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
+    } else if (typeName == "Color") {
+        glm::vec4 vec;
+        vec.r = getFloatAttribute(element, "R");
+        vec.g = getFloatAttribute(element, "G");
+        vec.b = getFloatAttribute(element, "B");
+        vec.a = getFloatAttribute(element, "A");
+        memcpy(outData, reinterpret_cast<char*>(&vec), getTypeStride(typeName));
+    } else if (typeName == "Quaternion") {
+        glm::quat q;
+        q.x = getFloatAttribute(element, "X");
+        q.y = getFloatAttribute(element, "Y");
+        q.z = getFloatAttribute(element, "Z");
+        q.w = getFloatAttribute(element, "W");
+        memcpy(outData, reinterpret_cast<char*>(&q), getTypeStride(typeName));
+    } else if (typeName == "float") {
         XSValue::Status status;
-        XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status);
-        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue), getTypeStride(typeName));
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_float, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_float), getTypeStride(typeName));
+    } else if (typeName == "double") {
+        XSValue::Status status;
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_double, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_double), getTypeStride(typeName));
+    } else if (typeName == "bool") {
+        XSValue::Status status;
+        XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_boolean, status);
+        memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue.f_bool), getTypeStride(typeName));
+    } else {
+        XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str()));
+        if (dataType == XSValue::DataType::dt_string) {
+            char* str = XMLString::transcode(element->getTextContent());
+            std::string standardString(str);
+            new (outData) std::string(str);
+            XMLString::release(&str);
+            //memcpy(outData, reinterpret_cast<char*>(&standardString), getTypeStride(typeName));
+        } else {
+            //XSValue::Status status;
+            //XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status);
+            //memcpy(outData, reinterpret_cast<char*>(&val->fData.fValue), getTypeStride(typeName));
+            LOG_WARNING("Unknown native data type: %s", typeName.c_str());
+        }
     }
 }