diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
index 66a15b12a..65f3d12a6 100644
--- a/src/types/definitions/chp_type.xml
+++ b/src/types/definitions/chp_type.xml
@@ -4,7 +4,7 @@
     <description>Character Properties.</description>
     <author>S. Ryan Ackley</author>
     <fields>
-      <field type="int" size="2" name="format flags">
+      <field type="int" size="2" name="format_flags">
         <bit number="0" mask="0x0001" name="fBold"/>
         <bit number="1" mask="0x0002" name="fItalic"/>
         <bit number="2" mask="0x0004" name="fRMarkDel"/>
@@ -22,7 +22,7 @@
         <bit number="14" mask="0x4000" name="fData"/>
         <bit number="15" mask="0x8000" name="fOle2"/>
       </field>
-      <field type="int" size="2" name="format flags1">
+      <field type="int" size="2" name="format_flags1">
         <bit number="0" mask="0x0001" name="fEmboss"/>
         <bit number="1" mask="0x0002" name="fImprint"/>
         <bit number="2" mask="0x0004" name="fDStrike"/>
diff --git a/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml
index 85d0da5f8..a3e43b932 100644
--- a/src/types/definitions/dop_type.xml
+++ b/src/types/definitions/dop_type.xml
@@ -83,8 +83,8 @@
       </field>
       <field type="short" size="2" name="Edn1">
         <bit number="0" mask="0x0003" name="epc"/>
-        <bit number="1" mask="0x003c" name="nfcFtnRef"/>
-        <bit number="2" mask="0x03c0" name="nfcEdnRef"/>
+        <bit number="1" mask="0x003c" name="nfcFtnRef1"/>
+        <bit number="2" mask="0x03c0" name="nfcEdnRef1"/>
         <bit number="3" mask="0x0400" name="fPrintFormData"/>
         <bit number="4" mask="0x0800" name="fSaveFormData"/>
         <bit number="5" mask="0x1000" name="fShadeFormData"/>
diff --git a/src/types/definitions/fib_type.xml b/src/types/definitions/fib_type.xml
index 07d384fd4..6f0dea490 100644
--- a/src/types/definitions/fib_type.xml
+++ b/src/types/definitions/fib_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101A" name="FIB" package="org.apache.poi.hdf.model.hdftypes.definitions">
+<record fromfile="true" name="FIB" package="org.apache.poi.hdf.model.hdftypes.definitions">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>File information Block.</description>
@@ -10,216 +10,218 @@
             <bit number="2" name="shadow" description="display a shadow for the chart"/>
         </field>
         -->
-        <field type="int" size="2" name="id"/>
-        <field type="int" size="2" name="version"/>
-        <field type="int" size="2" name="product version"/>
-    <field type="int" size="2" name="language stamp"/>
-    <field type="int" size="2" name="unknown 0"/>
-    <field type="int" size="2" name="options">
-            <bit number="0"  mask="0x0001" name="template"/>
-            <bit number="1"  mask="0x0002" name="glossary"/>
-            <bit number="2"  mask="0x0004" name="quicksave"/>
-            <bit number="3"  mask="0x0008" name="haspictr"/>                       
-            <bit number="4"  mask="0x00F0" name="nquicksaves"/>
-            <bit number="5"  mask="0x0100" name="encrypted"/>            
-            <bit number="6"  mask="0x0200" name="tabletype"/>
-            <bit number="7"  mask="0x0400" name="readonly"/>
-            <bit number="8"  mask="0x0800" name="writeReservation"/>
-            <bit number="9"  mask="0x1000" name="extendedCharacter"/>
-            <bit number="10" mask="0x2000" name="loadOverride"/>
-            <bit number="11" mask="0x4000" name="farEast"/>            
-            <bit number="12" mask="0x8000" name="crypto"/>            
+        <field type="int" size="2" name="wIdent" longname="id"/>
+        <field type="int" size="2" name="nFib" longname="version"/>
+        <field type="int" size="2" name="nProduct" longname="product version"/>
+    <field type="int" size="2" name="lid" longname="language stamp"/>
+    <field type="int" size="2" name="pnNext" longname="unknown 0"/>
+    <field type="short" size="2" name="options" longname="options">
+            <bit number="0"  mask="0x0001" name="fDot" longname="template"/>
+            <bit number="1"  mask="0x0002" name="fGlsy" longname="glossary"/>
+            <bit number="2"  mask="0x0004" name="fComplex" longname="quicksave"/>
+            <bit number="3"  mask="0x0008" name="fHasPic" longname="haspictr"/>
+            <bit number="4"  mask="0x00F0" name="cQuickSaves" longname="nquicksaves"/>
+            <bit number="5"  mask="0x0100" name="fEncrypted" longname="encrypted"/>
+            <bit number="6"  mask="0x0200" name="fWhichTblStm" longname="tabletype"/>
+            <bit number="7"  mask="0x0400" name="fReadOnlyRecommended" longname="readonly"/>
+            <bit number="8"  mask="0x0800" name="fWriteReservation" longname="writeReservation"/>
+            <bit number="9"  mask="0x1000" name="fExtChar" longname="extendedCharacter"/>
+            <bit number="10" mask="0x2000" name="fLoadOverride" longname="loadOverride"/>
+            <bit number="11" mask="0x4000" name="fFarEast" longname="farEast"/>
+            <bit number="12" mask="0x8000" name="fCrypto" longname="crypto"/>
     </field>
-    <field type="int" size="2" name="minversion"/>
-    <field type="int" size="2" name="encrypted key"/>
-    <field type="int" size="2" name="environment"/>
-    <field type="int" size="2" name="history">
-            <bit number="0"  mask="0x0001" name="history mac"/>
-            <bit number="1"  mask="0x0002" name="empty special"/>
-            <bit number="2"  mask="0x0004" name="load override hist"/>
-            <bit number="3"  mask="0x0008" name="feature undo"/>                       
-            <bit number="4"  mask="0x0010" name="v97 saved"/>
-            <bit number="5"  mask="0x00FE" name="spare"/>            
+    <field type="int" size="2" name="nFibBack" longname="minversion"/>
+    <field type="int" size="2" name="lKey" longname="encrypted key"/>
+    <field type="int" size="2" name="envr" longname="environment"/>
+    <field type="short" size="2" name="history" longname="history">
+            <bit number="0"  mask="0x0001" name="fMac" longname="history mac"/>
+            <bit number="1"  mask="0x0002" name="fEmptySpecial" longname="empty special"/>
+            <bit number="2"  mask="0x0004" name="fLoadOverridePage" longname="load override hist"/>
+            <bit number="3"  mask="0x0008" name="fFutureSavedUndo" longname="feature undo"/>
+            <bit number="4"  mask="0x0010" name="fWord97Saved" longname="v97 saved"/>
+            <bit number="5"  mask="0x00FE" name="fSpare0" longname="spare"/>
     </field>
-    <field type="int" size="2" name="default charset"/>
-    <field type="int" size="2" name="default extcharset"/>
-    <field type="int" size="4" name="offset first char"/>
-    <field type="int" size="4" name="offset last char"/>
-    <field type="int" size="2" name="count shorts"/>
-    
-    <field type="int" size="2" name="creator id or beg shorts"/>
-    <field type="int" size="2" name="revisor id"/>
-    <field type="int" size="2" name="creator private"/>
-    <field type="int" size="2" name="revisor private"/>
+    <field type="int" size="2" name="chs" longname="default charset"/>
+    <field type="int" size="2" name="chsTables" longname="default extcharset"/>
+    <field type="int" size="4" name="fcMin" longname="offset first char"/>
+    <field type="int" size="4" name="fcMac" longname="offset last char"/>
+    <field type="int" size="2" name="csw" longname="count shorts"/>
 
-    <field type="int" size="2" name="unused1"/>
-    <field type="int" size="2" name="unused2"/>
-    <field type="int" size="2" name="unused3"/>
-    <field type="int" size="2" name="unused4"/>
-    <field type="int" size="2" name="unused5"/>
-    <field type="int" size="2" name="unused6"/>
-    <field type="int" size="2" name="unused7"/>
-    <field type="int" size="2" name="unused8"/>
-    <field type="int" size="2" name="unused9"/>
+    <field type="int" size="2" name="wMagicCreated" longname="creator id or beg shorts"/>
+    <field type="int" size="2" name="wMagicRevised" longname="revisor id"/>
+    <field type="int" size="2" name="wMagicCreatedPrivate" longname="creator private"/>
+    <field type="int" size="2" name="wMagicRevisedPrivate" longname="revisor private"/>
 
-    <field type="int" size="2" name="fareastid"/>
-    <field type="int" size="2" name="countints"/>
-    
-    <field type="int" size="4" name="last byte or beg ints"/>
-    
-    <field type="int" size="4" name="creator build date"/>
-    <field type="int" size="4" name="revisor build date"/>
-    
-    <field type="int" size="4" name="main streamlen"/>
-    <field type="int" size="4" name="footnote streamlen"/>
-    <field type="int" size="4" name="header streamlen"/>
-    <field type="int" size="4" name="macro streamlen"/>
-    <field type="int" size="4" name="annotation streamlen"/>
-    <field type="int" size="4" name="endnote streamlen"/>
-    <field type="int" size="4" name="textbox streamlen"/>
-    <field type="int" size="4" name="headbox streamlen"/>
-    
-    <field type="int" size="4" name="ptr to plc list chp" description="rename me!"/>
-    <field type="int" size="4" name="first chp"/>
-    <field type="int" size="4" name="count chps"/>
-    
-    <field type="int" size="4" name="ptr to plc list pap" description="rename me!"/>
-    <field type="int" size="4" name="first pap"/>
-    <field type="int" size="4" name="count paps"/>
+    <field type="int" size="2" name="pnFbpChpFirst_W6" longname="unused1"/>
+    <field type="int" size="2" name="pnChpFirst_W6" longname="unused2"/>
+    <field type="int" size="2" name="cpnBteChp_W6" longname="unused3"/>
+    <field type="int" size="2" name="pnFbpPapFirst_W6" longname="unused4"/>
+    <field type="int" size="2" name="pnPapFirst_W6" longname="unused5"/>
+    <field type="int" size="2" name="cpnBtePap_W6" longname="unused6"/>
+    <field type="int" size="2" name="pnFbpLvcFirst_W6" longname="unused7"/>
+    <field type="int" size="2" name="pnLvcFirst_W6" longname="unused8"/>
+    <field type="int" size="2" name="cpnBteLvc_W6" longname="unused9"/>
 
-    <field type="int" size="4" name="ptr to plc list lvc" description="rename me!"/>
-    <field type="int" size="4" name="first lvc"/>
-    <field type="int" size="4" name="count lvc"/>
+    <field type="int" size="2" name="lidFE" longname="fareastid"/>
+    <field type="int" size="2" name="clw" longname="countints"/>
 
-    <field type="int" size="4" name="unknown1"/>
-    <field type="int" size="4" name="unknown2"/>
-    
-    <field type="int" size="2" name="lcb array size"/>
-    <field type="int" size="4" name="original stylesheet offset"/>
-    <field type="int" size="4" name="original stylesheet size"/>
-    <field type="int" size="4" name="stylesheet offset"/>
-    <field type="int" size="4" name="stylesheet size"/>
-    <field type="int" size="4" name="footnote ref offset"/>
-    <field type="int" size="4" name="footnote ref size"/>
-    
-    <field type="int" size="4" name="plc offset"/>
-    <field type="int" size="4" name="plc size"/>
-    
-    <field type="int" size="4" name="annotation ref offset"/>
-    <field type="int" size="4" name="annotation ref size"/>
+    <field type="int" size="4" name="cbMac" longname="last byte or beg ints"/>
 
-    <field type="int" size="4" name="annotation plc offset"/>
-    <field type="int" size="4" name="annotation plc size"/>
+    <field type="int" size="4" name="lProductCreated" longname="creator build date"/>
+    <field type="int" size="4" name="lProductRevised" longname="revisor build date"/>
 
-    <field type="int" size="4" name="section plc offset"/>
-    <field type="int" size="4" name="section plc size"/>
+    <field type="int" size="4" name="ccpText" longname="main streamlen"/>
+    <field type="int" size="4" name="ccpFtn" longname="footnote streamlen"/>
+    <field type="int" size="4" name="ccpHdd" longname="header streamlen"/>
+    <field type="int" size="4" name="ccpMcr" longname="macro streamlen"/>
+    <field type="int" size="4" name="ccpAtn" longname="annotation streamlen"/>
+    <field type="int" size="4" name="ccpEdn" longname="endnote streamlen"/>
+    <field type="int" size="4" name="ccpTxbx" longname="textbox streamlen"/>
+    <field type="int" size="4" name="ccpHdrTxbx" longname="headbox streamlen"/>
 
-    <field type="int" size="4" name="unusedA"/>
-    <field type="int" size="4" name="unusedB"/>
+    <field type="int" size="4" name="pnFbpChpFirst" longname="ptr to plc list chp" description="rename me!"/>
+    <field type="int" size="4" name="pnChpFirst" longname="first chp"/>
+    <field type="int" size="4" name="cpnBteChp" longname="count chps"/>
 
-    <field type="int" size="4" name="pheplc offset"/>
-    <field type="int" size="4" name="pheplc size"/>
+    <field type="int" size="4" name="pnFbpPapFirst" longname="ptr to plc list pap" description="rename me!"/>
+    <field type="int" size="4" name="pnPapFirst" longname="first pap"/>
+    <field type="int" size="4" name="cpnBtePap" longname="count paps"/>
 
-    <field type="int" size="4" name="glossaryST offset"/>
-    <field type="int" size="4" name="glossaryST size"/>
+    <field type="int" size="4" name="pnFbpLvcFirst" longname="ptr to plc list lvc" description="rename me!"/>
+    <field type="int" size="4" name="pnLvcFirst" longname="first lvc"/>
+    <field type="int" size="4" name="cpnBteLvc" longname="count lvc"/>
 
-    <field type="int" size="4" name="glossaryPLC offset"/>
-    <field type="int" size="4" name="glossaryPLC size"/>
+    <field type="int" size="4" name="fcIslandFirst" longname="unknown1"/>
+    <field type="int" size="4" name="fcIslandLim" longname="unknown2"/>
 
-    <field type="int" size="4" name="headerPLC offset"/>
-    <field type="int" size="4" name="headerPLC size"/>
+    <field type="int" size="2" name="cfclcb" longname="lcb array size"/>
+    <field type="int" size="4" name="fcStshfOrig" longname="original stylesheet offset"/>
+    <field type="int" size="4" name="lcbStshfOrig" longname="original stylesheet size"/>
+    <field type="int" size="4" name="fcStshf" longname="stylesheet offset"/>
+    <field type="int" size="4" name="lcbStshf" longname="stylesheet size"/>
+    <field type="int" size="4" name="fcPlcffndRef" longname="footnote ref offset"/>
+    <field type="int" size="4" name="lcbPlcffndRef" longname="footnote ref size"/>
 
-    <field type="int" size="4" name="chp_bin_table_offset"/>
-    <field type="int" size="4" name="chp_bin_table_size"/>
+    <field type="int" size="4" name="fcPlcffndTxt" longname="plc offset"/>
+    <field type="int" size="4" name="lcbPlcffndTxt" longname="plc size"/>
 
-    <field type="int" size="4" name="pap_bin_table_offset"/>
-    <field type="int" size="4" name="pap_bin_table_size"/>
+    <field type="int" size="4" name="fcPlcfandRef" longname="annotation ref offset"/>
+    <field type="int" size="4" name="lcbPlcfandRef" longname="annotation ref size"/>
 
-    <field type="int" size="4" name="sea_bin_table_offset"/>
-    <field type="int" size="4" name="sea_bin_table_size"/>
+    <field type="int" size="4" name="fcPlcfandTxt" longname="annotation plc offset"/>
+    <field type="int" size="4" name="lcbPlcfandTxt" longname="annotation plc size"/>
 
-    <field type="int" size="4" name="fonts_bin_table_offset"/>
-    <field type="int" size="4" name="fonts_bin_table_size"/>
-    
-    <field type="int" size="4" name="main_fields_offset"/>
-    <field type="int" size="4" name="main_fields_size"/>
+    <field type="int" size="4" name="fcPlcfsed" longname="section plc offset"/>
+    <field type="int" size="4" name="lcbPlcfsed" longname="section plc size"/>
 
-    <field type="int" size="4" name="header_fields_offset"/>
-    <field type="int" size="4" name="header_fields_size"/>
+    <field type="int" size="4" name="fcPlcpad" longname="unusedA"/>
+    <field type="int" size="4" name="lcbPlcpad" longname="unusedB"/>
 
-    <field type="int" size="4" name="footnote_fields_offset"/>
-    <field type="int" size="4" name="footnote_fields_size"/>
+    <field type="int" size="4" name="fcPlcfphe" longname="pheplc offset"/>
+    <field type="int" size="4" name="lcbPlcfphe" longname="pheplc size"/>
 
-    <field type="int" size="4" name="ann_fields_offset"/>
-    <field type="int" size="4" name="ann_fields_size"/>
-    
-    <field type="int" size="4" name="unusedC"/>
-    <field type="int" size="4" name="unusedD"/>
+    <field type="int" size="4" name="fcSttbfglsy" longname="glossaryST offset"/>
+    <field type="int" size="4" name="lcbSttbfglsy" longname="glossaryST size"/>
 
-    <field type="int" size="4" name="bookmark_names_offset"/>
-    <field type="int" size="4" name="bookmark_names_size"/>
-    <field type="int" size="4" name="bookmark_offsets_offset"/>
-    <field type="int" size="4" name="bookmark_offsets_size"/>
+    <field type="int" size="4" name="fcPlcfglsy" longname="glossaryPLC offset"/>
+    <field type="int" size="4" name="lcbPlcfglsy" longname="glossaryPLC size"/>
 
-    <field type="int" size="4" name="macros_offset"/>
-    <field type="int" size="4" name="macros_size"/>
+    <field type="int" size="4" name="fcPlcfhdd" longname="headerPLC offset"/>
+    <field type="int" size="4" name="lcbPlcfhdd" longname="headerPLC size"/>
 
-    <field type="int" size="4" name="unusedE"/>
-    <field type="int" size="4" name="unusedF"/>
-    <field type="int" size="4" name="unused10"/>
-    <field type="int" size="4" name="unused11"/>
-    
-    <field type="int" size="4" name="printer offset"/>
-    <field type="int" size="4" name="printer size"/>
-    <field type="int" size="4" name="printer portrait offset"/>
-    <field type="int" size="4" name="printer portrait size"/>
-    <field type="int" size="4" name="printer landscape offset"/>
-    <field type="int" size="4" name="printer landscape size"/>
+    <field type="int" size="4" name="fcPlcfbteChpx" longname="chp_bin_table_offset"/>
+    <field type="int" size="4" name="lcbPlcfbteChpx" longname="chp_bin_table_size"/>
 
-    <field type="int" size="4" name="wss offset"/>
-    <field type="int" size="4" name="wss size"/>
-    
-    <field type="int" size="4" name="DOP offset"/>
-    <field type="int" size="4" name="DOP size"/>
+    <field type="int" size="4" name="fcPlcfbtePapx" longname="pap_bin_table_offset"/>
+    <field type="int" size="4" name="lcbPlcfbtePapx" longname="pap_bin_table_size"/>
 
-    <field type="int" size="4" name="sttbfassoc_offset"/>
-    <field type="int" size="4" name="sttbfassoc_size"/>
+    <field type="int" size="4" name="fcPlcfsea" longname="sea_bin_table_offset"/>
+    <field type="int" size="4" name="lcbPlcfsea" longname="sea_bin_table_size"/>
 
-    <field type="int" size="4" name="textPieceTable offset"/>
-    <field type="int" size="4" name="textPieceTable size"/>
-    
-    <field type="int" size="4" name="unused12"/>
-    <field type="int" size="4" name="unused13"/>
-    
-    <field type="int" size="4" name="offset AutosaveSource"/>
-    <field type="int" size="4" name="count AutosaveSource"/>
-    
-    <field type="int" size="4" name="offset GrpXstAtnOwners"/>
-    <field type="int" size="4" name="count GrpXstAtnOwners"/>
-    
-    <field type="int" size="4" name="offset SttbfAtnbkmk"/>
-    <field type="int" size="4" name="length SttbfAtnbkmk"/>
+    <field type="int" size="4" name="fcSttbfffn" longname="fonts_bin_table_offset"/>
+    <field type="int" size="4" name="lcbSttbfffn" longname="fonts_bin_table_size"/>
 
-    <field type="int" size="4" name="unused14"/>
-    <field type="int" size="4" name="unused15"/>
-    <field type="int" size="4" name="unused16"/>
-    <field type="int" size="4" name="unused17"/>
+    <field type="int" size="4" name="fcPlcffldMom" longname="main_fields_offset"/>
+    <field type="int" size="4" name="lcbPlcffldMom" longname="main_fields_size"/>
 
-    <field type="int" size="4" name="offset PlcspaMom"/>
-    <field type="int" size="4" name="length PlcspaMom"/>
+    <field type="int" size="4" name="fcPlcffldHdr" longname="header_fields_offset"/>
+    <field type="int" size="4" name="lcbPlcffldHdr" longname="header_fields_size"/>
 
-    <field type="int" size="4" name="offset PlcspaHdr"/>
-    <field type="int" size="4" name="length PlcspaHdr"/>
+    <field type="int" size="4" name="fcPlcffldFtn" longname="footnote_fields_offset"/>
+    <field type="int" size="4" name="lcbPlcffldFtn" longname="footnote_fields_size"/>
 
-    <field type="int" size="4" name="length Plcf Ann Bkmrk First"/>
-    <field type="int" size="4" name="offset Plcf Ann Bkmrk First"/>
+    <field type="int" size="4" name="fcPlcffldAtn" longname="ann_fields_offset"/>
+    <field type="int" size="4" name="lcbPlcffldAtn" longname="ann_fields_size"/>
 
-    <field type="int" size="4" name="length Plcf Ann Bkark Last"/>
+    <field type="int" size="4" name="fcPlcffldMcr" longname="unusedC"/>
+    <field type="int" size="4" name="lcbPlcffldMcr" longname="unusedD"/>
+
+    <field type="int" size="4" name="fcSttbfbkmk" longname="bookmark_names_offset"/>
+    <field type="int" size="4" name="lcbSttbfbkmk" longname="bookmark_names_size"/>
+    <field type="int" size="4" name="fcPlcfbkf" longname="bookmark_offsets_offset"/>
+    <field type="int" size="4" name="lcbPlcfbkf" longname="bookmark_offsets_size"/>
+    <field type="int" size="4" name="fcPlcfbkl" longname="bookmark_end_offset"/>
+    <field type="int" size="4" name="lcbPlcfbkl" longname="bookmark_end_size"/>
+
+    <field type="int" size="4" name="fcCmds" longname="macros_offset"/>
+    <field type="int" size="4" name="lcbCmds" longname="macros_size"/>
+
+    <field type="int" size="4" name="fcPlcmcr" longname="unusedE"/>
+    <field type="int" size="4" name="lcbPlcmcr" longname="unusedF"/>
+    <field type="int" size="4" name="fcSttbfmcr" longname="unused10"/>
+    <field type="int" size="4" name="lcbSttbfmcr" longname="unused11"/>
+
+    <field type="int" size="4" name="fcPrDrvr" longname="printer offset"/>
+    <field type="int" size="4" name="lcbPrDrvr" longname="printer size"/>
+    <field type="int" size="4" name="fcPrEnvPort" longname="printer portrait offset"/>
+    <field type="int" size="4" name="lcbPrEnvPort" longname="printer portrait size"/>
+    <field type="int" size="4" name="fcPrEnvLand" longname="printer landscape offset"/>
+    <field type="int" size="4" name="lcbPrEnvLand" longname="printer landscape size"/>
+
+    <field type="int" size="4" name="fcWss" longname="wss offset"/>
+    <field type="int" size="4" name="lcbWss" longname="wss size"/>
+
+    <field type="int" size="4" name="fcDop" longname="DOP offset"/>
+    <field type="int" size="4" name="lcbDop" longname="DOP size"/>
+
+    <field type="int" size="4" name="fcSttbfAssoc" longname="sttbfassoc_offset"/>
+    <field type="int" size="4" name="lcbSttbfAssoc" longname="sttbfassoc_size"/>
+
+    <field type="int" size="4" name="fcClx" longname="textPieceTable offset"/>
+    <field type="int" size="4" name="lcbClx" longname="textPieceTable size"/>
+
+    <field type="int" size="4" name="fcPlcfpgdFtn" longname="unused12"/>
+    <field type="int" size="4" name="lcbPlcfpgdFtn" longname="unused13"/>
+
+    <field type="int" size="4" name="fcAutosaveSource" longname="offset AutosaveSource"/>
+    <field type="int" size="4" name="lcbAutosaveSource" longname="count AutosaveSource"/>
+
+    <field type="int" size="4" name="fcGrpXstAtnOwners" longname="offset GrpXstAtnOwners"/>
+    <field type="int" size="4" name="lcbGrpXstAtnOwners" longname="count GrpXstAtnOwners"/>
+
+    <field type="int" size="4" name="fcSttbfAtnbkmk" longname="offset SttbfAtnbkmk"/>
+    <field type="int" size="4" name="lcbSttbfAtnbkmk" longname="length SttbfAtnbkmk"/>
+
+    <field type="int" size="4" name="fcPlcdoaMom" longname="unused14"/>
+    <field type="int" size="4" name="lcbPlcdoaMom" longname="unused15"/>
+    <field type="int" size="4" name="fcPlcdoaHdr" longname="unused16"/>
+    <field type="int" size="4" name="lcbPlcdoaHdr" longname="unused17"/>
+
+    <field type="int" size="4" name="fcPlcspaMom" longname="offset PlcspaMom"/>
+    <field type="int" size="4" name="lcbPlcspaMom" longname="length PlcspaMom"/>
+
+    <field type="int" size="4" name="fcPlcspaHdr" longname="offset PlcspaHdr"/>
+    <field type="int" size="4" name="lcbPlcspaHdr" longname="length PlcspaHdr"/>
+
+    <field type="int" size="4" name="fcPlcfAtnbkf" longname="length Plcf Ann Bkmrk First"/>
+    <field type="int" size="4" name="lcbPlcfAtnbkf" longname="offset Plcf Ann Bkmrk First"/>
+
+    <field type="int" size="4" name="fcPlcfAtnbkl" longname="length Plcf Ann Bkark Last"/>
+
+    <field type="int" size="4" name="lcbPlcfAtnbkl"/>
 
-    <field type="int" size="4" name="PlcfAtnbkl"/>
-   
     <field type="int" size="4" name="fcPms"/>
-    
+
     <field type="int" size="4" name="lcbPms"/>
     <field type="int" size="4" name="fcFormFldSttbs"/>
 
@@ -231,7 +233,7 @@
     <field type="int" size="4" name="lcbPlcfendTxt"/>
     <field type="int" size="4" name="fcPlcffldEdn"/>
     <field type="int" size="4" name="lcbPlcffldEdn"/>
-    
+
     <field type="int" size="4" name="fcPlcfpgdEdn"/>
     <field type="int" size="4" name="lcbPlcfpgdEdn"/>
     <field type="int" size="4" name="fcDggInfo"/>
@@ -257,7 +259,7 @@
     <field type="int" size="4" name="fcPlcffldHdrTxbx"/>
     <field type="int" size="4" name="lcbPlcffldHdrTxbx"/>
     <field type="int" size="4" name="fcStwUser"/>
-    <field type="int" size="4" name="lcbStwUser"/>    
+    <field type="int" size="4" name="lcbStwUser"/>
 
     <field type="int" size="4" name="fcSttbttmbd"/>
     <field type="int" size="4" name="cbSttbttmbd"/>
@@ -281,7 +283,7 @@
     <field type="int" size="4" name="lcbSttbfIntlFld"/>
     <field type="int" size="4" name="fcRouteSlip"/>
     <field type="int" size="4" name="lcbRouteSlip"/>
-    
+
     <field type="int" size="4" name="fcSttbSavedBy"/>
     <field type="int" size="4" name="lcbSttbSavedBy"/>
     <field type="int" size="4" name="fcSttbFnm"/>
@@ -333,5 +335,5 @@
 
 
     </fields>
-    
+
 </record>
diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index 652f8d7d9..7c90b2953 100644
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -12,8 +12,8 @@
       <field type="int" size="4" name="tlp"/>
       <field type="int" size="2" name="itcMac"/>
       <field type="short[]" size="130" name="rgdxaCenter"/>
-      <field type="TableCell[]" name="rgtc"/>
-      <field type="ShadeDescriptor[]" name="rgshd"/>
-      <field type="BorderCode[]" name="rgbrcTable"/>
+      <field type="TableCell[]" size="0" name="rgtc"/>
+      <field type="ShadeDescriptor[]" size="0" name="rgshd"/>
+      <field type="BorderCode[]" size="0" name="rgbrcTable"/>
     </fields>
 </record>
\ No newline at end of file