Added datatype XIDCG uses so they are not hardcoded in generators

 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  Copyright (c) 2017, TeleCommunication Systems, Inc.,
+  Copyright (c) 2018, TeleCommunication Systems, Inc.,
   a wholly-owned subsidiary of Comtech Telecommunications Corp.
   and/or affiliates of TeleCommunication Systems, Inc.
   All rights reserved.
@@ -153,7 +153,7 @@
             <!-- may change this type -->
             <lang name="c" type="CXMFString" include="Tensor/CXMF/CXMFString.h"/>
             <lang name="cpp" type="::Tensor::XMF::Atom" include="Tensor/XMF/Atom.h"/>
-            <lang name="java" type="Atom" include="com.comtechtel.tensor.xmf.Atom"/>
+            <lang name="java" type="XidRaw" include="com.comtechtel.tensor.xid.XidRaw"/>
             <lang name="node" type="Atom"/>
         </type>
 
@@ -201,13 +201,13 @@
           <comment>JSON formatted/encoded string</comment>
           <lang name="c" type="CXMFString" include="Tensor/CXMF/CXMFString.h"/>
           <lang name="cpp" type="::Tensor::JSON::JSONObj" include="Tensor/JSON/TensorJSON.h"/>
-          <lang name="java" type="XidString" include="com.comtechtel.tensor.xid.XidString"/>
+          <lang name="java" type="XidJSON" include="com.comtechtel.tensor.xid.XidJSON"/>
           <lang name="node" type="XidString"/>
         </type>
 
         <type name="xmf">
             <comment>XMF formatted/encoded data, this is straight XMF in XMF formatted data, and base64 encoded binary XMF in JSON formatted data. </comment>
-            <lang name="c" type="CAtom" include="Tensor/CXMF/GetPut.h"/>
+            <lang name="c" type="CAtom" include="Tensor/CXMF/CXMF.h"/>
             <lang name="cpp" type="::Tensor::XMF::Atom" include="Tensor/XMF/Atom.h"/>
             <lang name="java" type="Atom" include="com.comtechtel.tensor.xmf.Atom"/>
             <lang name="node" type="Atom"/>
@@ -284,5 +284,49 @@
                 </comment>
             </literal>
         </enum> 
+
+
+
+        <!-- These types are not intended to be used in XID declarations. -->
+        <!-- They are used in XIDCG so that types are not hardcoded. -->
+        <!-- In theory, you can override "Atom",etc. with your our API compatible implementation,
+			 renerate and have a completely different encoding support.
+			 For instance, this can be used to define and encode TCAP BER.
+		-->
+        <type  name="Atom">
+            <comment>Atom type XIDCG uses </comment>
+            <!-- may change this type -->
+            <!-- <lang name="c" type="CAtom" include="Tensor/CXMF/CXMF.h"/> -->
+            <lang name="c" type="CAtom" include="Tensor/CXMF/CXMF.h"/>
+            <lang name="cpp" type="::Tensor::XMF::Atom" include="Tensor/XMF/Atom.h"/>
+            <lang name="java" type="Atom" include="com.comtechtel.tensor.xmf.Atom"/>
+            <lang name="node" type="Atom"/>
+        </type>
+        <type  name="AtomList">
+            <comment>AtomList type XIDCG uses </comment>
+            <!-- may change this type -->
+            <!-- <lang name="c" type="CAtomList" include="Tensor/CXMF/CXMF.h"/> -->
+            <lang name="c" type="CAtomList" include="Tensor/CXMF/CXMF.h"/>
+            <lang name="cpp" type="::Tensor::XMF::AtomList" include="Tensor/XMF/AtomList.h"/>
+            <lang name="java" type="AtomList" include="com.comtechtel.tensor.xmf.AtomList"/>
+            <lang name="node" type="AtomList"/>
+        </type>
+        <type  name="PackedAtomList">
+            <comment>PackedAtomList type XIDCG uses </comment>
+            <!-- may change this type -->
+            <!-- <lang name="c" type="CPackedAtomList" include="Tensor/CXMF/CXMF.h"/> -->
+            <lang name="c" type="CPackedAtomList" include="Tensor/CXMF/CXMF.h"/>
+            <lang name="cpp" type="::Tensor::XMF::PackedAtomList" include="Tensor/XMF/PackedAtomList.h"/>
+            <lang name="java" type="PackedAtomList" include="com.comtechtel.tensor.xmf.PackedAtomList"/>
+            <lang name="node" type="PackedAtomList"/>
+        </type>
+        <type  name="JSONObject">
+            <comment>JSONObject type XIDCG uses </comment>
+            <!-- may change this type -->
+            <!-- <lang name="c" type="" include=""/> -->
+            <lang name="cpp" type="::Tensor::JSON::JSONObj" include="Tensor/JSON/TensorJSON.h"/>
+            <lang name="java" type="JSONObject" include="com.comtechtel.tensor.json.JSONObject"/>
+            <!-- <lang name="node" type=""/> -->
+        </type>
     </namespace>
 </specification>