diff --git a/component.xml b/component.xml
deleted file mode 100644
index defef7f..0000000
--- a/component.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
-   name="mantle-net-suite-connector" version="1.0.0">
-</component>
diff --git a/data/TestResourceData.xml b/data/TestResourceData.xml
new file mode 100644
index 0000000..3039433
--- /dev/null
+++ b/data/TestResourceData.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-facade-xml type="test">
+    
+    <dataDocuments dataDocumentId="Order" indexName="order_header" documentName="OrderHeader" primaryEntityName="org.apache.ofbiz.order.order.OrderHeader">
+        <fields fieldSeqId="01" fieldPath="orderId"/>
+        <fields fieldSeqId="02" fieldPath="orderName"/>
+        <fields fieldSeqId="03" fieldPath="org.apache.ofbiz.common.enum.Enumeration:description" fieldNameAlias="salesChannelEnumId"/>
+        <fields fieldSeqId="04" fieldPath="org.apache.ofbiz.order.order.OrderItem:orderItemSeqId"/>
+        <fields fieldSeqId="05" fieldPath="org.apache.ofbiz.order.order.OrderItem:productId"/>
+        <fields fieldSeqId="06" fieldPath="org.apache.ofbiz.order.order.OrderItem:unitPrice"/>
+        <fields fieldSeqId="07" fieldPath="org.apache.ofbiz.order.order.OrderItem:quantity" fieldNameAlias="orderQuantity"/>
+        <fields fieldSeqId="08" fieldPath="orderDate" defaultDisplay="N"/>
+        <fields fieldSeqId="42" fieldPath="(&quot;${orderDate.format('dd/MM/yyyy')}&quot;)" fieldNameAlias="orderDateFormatted"/>
+        <fields fieldSeqId="09" fieldPath="org.apache.ofbiz.order.order.OrderItem:org.apache.ofbiz.order.order.OrderAdjustment:orderAdjustmentTypeId" fieldNameAlias="orderAdjustmentTypeId"/>
+        <fields fieldSeqId="10" fieldPath="org.apache.ofbiz.order.order.OrderItem:org.apache.ofbiz.order.order.OrderAdjustment:amount" fieldNameAlias="amount"/>
+
+        <fields fieldSeqId="11" fieldPath="org.apache.ofbiz.order.order.OrderAdjustment:orderAdjustmentTypeId" fieldNameAlias="orderAdjustmentTypeIdSC"/>
+        <fields fieldSeqId="12" fieldPath="org.apache.ofbiz.order.order.OrderAdjustment:amount" fieldNameAlias="amountSC" functionName="sum"/>
+
+        <fields fieldSeqId="13" fieldPath="org.apache.ofbiz.order.order.OrderItem:org.apache.ofbiz.product.product.Product:org.apache.ofbiz.product.product.GoodIdentification:goodIdentificationTypeId" fieldNameAlias="goodIdentificationTypeId"/>
+        <fields fieldSeqId="14" fieldPath="org.apache.ofbiz.order.order.OrderItem:org.apache.ofbiz.product.product.Product:org.apache.ofbiz.product.product.GoodIdentification:idValue" fieldNameAlias="idValue"/>
+
+        <fields fieldSeqId="15" fieldPath="org.apache.ofbiz.order.order.OrderRole:org.apache.ofbiz.party.party.Party:org.apache.ofbiz.party.party.PartyIdentification:partyIdentificationTypeId" fieldNameAlias="partyIdentificationTypeId"/>
+        <fields fieldSeqId="16" fieldPath="org.apache.ofbiz.order.order.OrderRole:org.apache.ofbiz.party.party.Party:org.apache.ofbiz.party.party.PartyIdentification:idValue" fieldNameAlias="idValue"/>
+
+        <fields fieldSeqId="17" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:contactMechPurposeTypeId" fieldNameAlias="contactMechPurposeTypeId"/>
+        <fields fieldSeqId="18" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:toName" fieldNameAlias="billingAddressee"/>
+        <fields fieldSeqId="19" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:address1" fieldNameAlias="billingAddress1"/>
+        <fields fieldSeqId="20" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:address2" fieldNameAlias="billingAddress2"/>
+        <fields fieldSeqId="21" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:city" fieldNameAlias="billingCity"/>
+        <fields fieldSeqId="22" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:stateProvinceGeoId" fieldNameAlias="billingState"/>
+        <fields fieldSeqId="23" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:postalCode" fieldNameAlias="billingPostalCode"/>
+        <fields fieldSeqId="24" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.PostalAddress:Country:geoCode" fieldNameAlias="billingGeoCode"/>
+
+        <fields fieldSeqId="25" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:infoString" fieldNameAlias="billingEmail"/>
+
+        <fields fieldSeqId="26" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.TelecomNumber:countryCode" fieldNameAlias="billingCountryCode"/>
+        <fields fieldSeqId="27" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.TelecomNumber:areaCode" fieldNameAlias="billingAreaCode"/>
+        <fields fieldSeqId="28" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:org.apache.ofbiz.party.contact.TelecomNumber:contactNumber" fieldNameAlias="billingContactNumber"/>
+
+        <fields fieldSeqId="29" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:toName" fieldNameAlias="shippingAddressee"/>
+        <fields fieldSeqId="30" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:address1" fieldNameAlias="shippingAddress1"/>
+        <fields fieldSeqId="31" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:address2" fieldNameAlias="shippingAddress2"/>
+        <fields fieldSeqId="32" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:city" fieldNameAlias="shippingCity"/>
+        <fields fieldSeqId="33" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:stateProvinceGeoId" fieldNameAlias="shippingStateProvinceGeoId"/>
+        <fields fieldSeqId="34" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:org.apache.ofbiz.party.contact.PostalAddress:postalCode" fieldNameAlias="shippingPostalCode"/>
+
+        <fields fieldSeqId="36" fieldPath="org.apache.ofbiz.order.order.OrderContactMech:org.apache.ofbiz.party.contact.ContactMech:infoString" fieldNameAlias="shippingEmail"/>
+
+        <fields fieldSeqId="37" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:TelecomNumber:countryCode" fieldNameAlias="shippingCountryCode"/>
+        <fields fieldSeqId="38" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:TelecomNumber:areaCode" fieldNameAlias="shippingAreaCode"/>
+        <fields fieldSeqId="39" fieldPath="org.apache.ofbiz.order.order.OrderItemShipGroup:TelecomNumber:contactNumber" fieldNameAlias="shippingContactNumber"/>
+
+        <!-- Not Working, Fields are being evaluated to null     
+          <fields fieldSeqId="40" fieldPath="(&quot;${shippingCountryCode?:'A'}${shippingAreaCode?:'B'}${shippingContactNumber?:'C'}&quot;)" fieldNameAlias="shippingPhone" fieldType="text"/>-->
+
+        <!--        <fields fieldSeqId="41" fieldPath="(&quot;${billingCountryCode?:'E'}${billingAreaCode?:'P'}${billingContactNumber?:'F'}&quot;)" fieldNameAlias="billingPhone" fieldType="text"/>-->
+
+        <conditions fieldNameAlias="goodIdentificationTypeId" operator="equals" fieldValue="NETSUITE_PRODUCT_ID" conditionSeqId="01"/>
+        <conditions fieldNameAlias="partyIdentificationTypeId" operator="equals" fieldValue="NETSUITE_CUSTOMER_ID" conditionSeqId="02"/>
+        <conditions fieldNameAlias="contactMechPurposeTypeId" operator="in" fieldValue="BILLING_EMAIL,BILLING_LOCATION,SHIPPING_EMAIL,PHONE_BILLING" conditionSeqId="03"/>
+        <conditions fieldNameAlias="orderAdjustmentTypeId" fieldValue="EXT_PROMO_ADJUSTMENT" conditionSeqId="04"/>
+        <conditions fieldNameAlias="orderAdjustmentTypeIdSC" fieldValue="SHIPPING_CHARGES" conditionSeqId="05"/>
+    </dataDocuments>
+</entity-facade-xml>
\ No newline at end of file
diff --git a/lib/mysql-connector-j-8.0.33.jar b/lib/mysql-connector-j-8.0.33.jar
new file mode 100644
index 0000000..3f741f5
Binary files /dev/null and b/lib/mysql-connector-j-8.0.33.jar differ
diff --git a/service/co/hotwax/common/CommonServices.xml b/service/co/hotwax/common/CommonServices.xml
new file mode 100644
index 0000000..0b54ef6
--- /dev/null
+++ b/service/co/hotwax/common/CommonServices.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://moqui.org/xsd/service-definition-3.xsd">
+    <service verb="search" noun="OrderDataDocument" type="inline" authenticate="anonymous-all">
+        <out-parameters>
+            <parameter name="output" allow-html="any"/>
+        </out-parameters>
+        <actions>
+            <script><![CDATA[                
+                List<Map> docMapList = ec.entity.getDataDocuments("Order", null, null, null) 
+                i = 0               
+            ]]></script>
+            <set field="output" from="new LinkedList()"/>
+            <iterate list="docMapList" entry="docMap">
+                <script>
+                    i++
+                    String docString = groovy.json.JsonOutput.toJson(docMap)
+                    String prettyDocString = groovy.json.JsonOutput.prettyPrint(docString)
+                    output.add(docMap)
+                    if (i==5) break;
+                </script>                
+            </iterate>
+        </actions>
+    </service>    
+</services>
\ No newline at end of file